<!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>[47122] trunk: Docs: Improve inline comments per the documentation standards.</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/47122">47122</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/47122","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-01-29 00:43:23 +0000 (Wed, 29 Jan 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'>Docs: Improve inline comments per the documentation standards.

Includes minor code layout fixes for better readability.

See <a href="https://core.trac.wordpress.org/ticket/48303">#48303</a>.</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkGruntfilejs">trunk/Gruntfile.js</a></li>

<li><a href="#trunkphpcompatxmldist">trunk/phpcompat.xml.dist</a></li>

<li><a href="#trunkphpcsxmldist">trunk/phpcs.xml.dist</a></li>

<li><a href="#trunkphpunitxmldist">trunk/phpunit.xml.dist</a></li>

<li><a href="#trunksrcindexphp">trunk/src/index.php</a></li>

<li><a href="#trunksrcjs_enqueuesadmincommentjs">trunk/src/js/_enqueues/admin/comment.js</a></li>

<li><a href="#trunksrcjs_enqueuesadmincommonjs">trunk/src/js/_enqueues/admin/common.js</a></li>

<li><a href="#trunksrcjs_enqueuesadmineditcommentsjs">trunk/src/js/_enqueues/admin/edit-comments.js</a></li>

<li><a href="#trunksrcjs_enqueuesadmininlineeditpostjs">trunk/src/js/_enqueues/admin/inline-edit-post.js</a></li>

<li><a href="#trunksrcjs_enqueuesadmininlineedittaxjs">trunk/src/js/_enqueues/admin/inline-edit-tax.js</a></li>

<li><a href="#trunksrcjs_enqueuesadminlinkjs">trunk/src/js/_enqueues/admin/link.js</a></li>

<li><a href="#trunksrcjs_enqueuesadminmediauploadjs">trunk/src/js/_enqueues/admin/media-upload.js</a></li>

<li><a href="#trunksrcjs_enqueuesadminplugininstalljs">trunk/src/js/_enqueues/admin/plugin-install.js</a></li>

<li><a href="#trunksrcjs_enqueuesadminpostjs">trunk/src/js/_enqueues/admin/post.js</a></li>

<li><a href="#trunksrcjs_enqueuesadminpostboxjs">trunk/src/js/_enqueues/admin/postbox.js</a></li>

<li><a href="#trunksrcjs_enqueuesadminprivacytoolsjs">trunk/src/js/_enqueues/admin/privacy-tools.js</a></li>

<li><a href="#trunksrcjs_enqueuesadminsitehealthjs">trunk/src/js/_enqueues/admin/site-health.js</a></li>

<li><a href="#trunksrcjs_enqueuesadmintagsboxjs">trunk/src/js/_enqueues/admin/tags-box.js</a></li>

<li><a href="#trunksrcjs_enqueuesadmintagssuggestjs">trunk/src/js/_enqueues/admin/tags-suggest.js</a></li>

<li><a href="#trunksrcjs_enqueuesadmintagsjs">trunk/src/js/_enqueues/admin/tags.js</a></li>

<li><a href="#trunksrcjs_enqueuesadminuserprofilejs">trunk/src/js/_enqueues/admin/user-profile.js</a></li>

<li><a href="#trunksrcjs_enqueuesadminwidgetsjs">trunk/src/js/_enqueues/admin/widgets.js</a></li>

<li><a href="#trunksrcjs_enqueueslibaccordionjs">trunk/src/js/_enqueues/lib/accordion.js</a></li>

<li><a href="#trunksrcjs_enqueueslibadminbarjs">trunk/src/js/_enqueues/lib/admin-bar.js</a></li>

<li><a href="#trunksrcjs_enqueueslibajaxresponsejs">trunk/src/js/_enqueues/lib/ajax-response.js</a></li>

<li><a href="#trunksrcjs_enqueueslibauthcheckjs">trunk/src/js/_enqueues/lib/auth-check.js</a></li>

<li><a href="#trunksrcjs_enqueueslibcolorpickerjs">trunk/src/js/_enqueues/lib/color-picker.js</a></li>

<li><a href="#trunksrcjs_enqueueslibcommentreplyjs">trunk/src/js/_enqueues/lib/comment-reply.js</a></li>

<li><a href="#trunksrcjs_enqueueslibcookiesjs">trunk/src/js/_enqueues/lib/cookies.js</a></li>

<li><a href="#trunksrcjs_enqueueslibgalleryjs">trunk/src/js/_enqueues/lib/gallery.js</a></li>

<li><a href="#trunksrcjs_enqueueslibimageeditjs">trunk/src/js/_enqueues/lib/image-edit.js</a></li>

<li><a href="#trunksrcjs_enqueuesliblinkjs">trunk/src/js/_enqueues/lib/link.js</a></li>

<li><a href="#trunksrcjs_enqueueslibnavmenujs">trunk/src/js/_enqueues/lib/nav-menu.js</a></li>

<li><a href="#trunksrcjs_enqueueslibpointerjs">trunk/src/js/_enqueues/lib/pointer.js</a></li>

<li><a href="#trunksrcjs_enqueueslibquicktagsjs">trunk/src/js/_enqueues/lib/quicktags.js</a></li>

<li><a href="#trunksrcjs_enqueuesvendorpluploadhandlersjs">trunk/src/js/_enqueues/vendor/plupload/handlers.js</a></li>

<li><a href="#trunksrcjs_enqueuesvendorpluploadwppluploadjs">trunk/src/js/_enqueues/vendor/plupload/wp-plupload.js</a></li>

<li><a href="#trunksrcjs_enqueuesvendortinymcepluginscompat3xpluginjs">trunk/src/js/_enqueues/vendor/tinymce/plugins/compat3x/plugin.js</a></li>

<li><a href="#trunksrcjs_enqueuesvendortinymcepluginswordpresspluginjs">trunk/src/js/_enqueues/vendor/tinymce/plugins/wordpress/plugin.js</a></li>

<li><a href="#trunksrcjs_enqueuesvendortinymcepluginswpautoresizepluginjs">trunk/src/js/_enqueues/vendor/tinymce/plugins/wpautoresize/plugin.js</a></li>

<li><a href="#trunksrcjs_enqueuesvendortinymcepluginswpdialogspluginjs">trunk/src/js/_enqueues/vendor/tinymce/plugins/wpdialogs/plugin.js</a></li>

<li><a href="#trunksrcjs_enqueuesvendortinymcepluginswpeditimagepluginjs">trunk/src/js/_enqueues/vendor/tinymce/plugins/wpeditimage/plugin.js</a></li>

<li><a href="#trunksrcjs_enqueuesvendortinymcepluginswpemojipluginjs">trunk/src/js/_enqueues/vendor/tinymce/plugins/wpemoji/plugin.js</a></li>

<li><a href="#trunksrcjs_enqueuesvendortinymcepluginswpgallerypluginjs">trunk/src/js/_enqueues/vendor/tinymce/plugins/wpgallery/plugin.js</a></li>

<li><a href="#trunksrcjs_enqueuesvendortinymcepluginswplinkpluginjs">trunk/src/js/_enqueues/vendor/tinymce/plugins/wplink/plugin.js</a></li>

<li><a href="#trunksrcjs_enqueuesvendortinymcepluginswptextpatternpluginjs">trunk/src/js/_enqueues/vendor/tinymce/plugins/wptextpattern/plugin.js</a></li>

<li><a href="#trunksrcjs_enqueuesvendortinymcepluginswpviewpluginjs">trunk/src/js/_enqueues/vendor/tinymce/plugins/wpview/plugin.js</a></li>

<li><a href="#trunksrcjs_enqueuesvendortinymcewptinymcephp">trunk/src/js/_enqueues/vendor/tinymce/wp-tinymce.php</a></li>

<li><a href="#trunksrcjs_enqueueswpapirequestjs">trunk/src/js/_enqueues/wp/api-request.js</a></li>

<li><a href="#trunksrcjs_enqueueswpapijs">trunk/src/js/_enqueues/wp/api.js</a></li>

<li><a href="#trunksrcjs_enqueueswpautosavejs">trunk/src/js/_enqueues/wp/autosave.js</a></li>

<li><a href="#trunksrcjs_enqueueswpcodeeditorjs">trunk/src/js/_enqueues/wp/code-editor.js</a></li>

<li><a href="#trunksrcjs_enqueueswpcustomheaderjs">trunk/src/js/_enqueues/wp/custom-header.js</a></li>

<li><a href="#trunksrcjs_enqueueswpcustomizebasejs">trunk/src/js/_enqueues/wp/customize/base.js</a></li>

<li><a href="#trunksrcjs_enqueueswpcustomizecontrolsjs">trunk/src/js/_enqueues/wp/customize/controls.js</a></li>

<li><a href="#trunksrcjs_enqueueswpcustomizeloaderjs">trunk/src/js/_enqueues/wp/customize/loader.js</a></li>

<li><a href="#trunksrcjs_enqueueswpcustomizemodelsjs">trunk/src/js/_enqueues/wp/customize/models.js</a></li>

<li><a href="#trunksrcjs_enqueueswpcustomizenavmenusjs">trunk/src/js/_enqueues/wp/customize/nav-menus.js</a></li>

<li><a href="#trunksrcjs_enqueueswpcustomizepreviewwidgetsjs">trunk/src/js/_enqueues/wp/customize/preview-widgets.js</a></li>

<li><a href="#trunksrcjs_enqueueswpcustomizepreviewjs">trunk/src/js/_enqueues/wp/customize/preview.js</a></li>

<li><a href="#trunksrcjs_enqueueswpcustomizeselectiverefreshjs">trunk/src/js/_enqueues/wp/customize/selective-refresh.js</a></li>

<li><a href="#trunksrcjs_enqueueswpcustomizewidgetsjs">trunk/src/js/_enqueues/wp/customize/widgets.js</a></li>

<li><a href="#trunksrcjs_enqueueswpeditorbasejs">trunk/src/js/_enqueues/wp/editor/base.js</a></li>

<li><a href="#trunksrcjs_enqueueswpeditordfwjs">trunk/src/js/_enqueues/wp/editor/dfw.js</a></li>

<li><a href="#trunksrcjs_enqueueswpemojijs">trunk/src/js/_enqueues/wp/emoji.js</a></li>

<li><a href="#trunksrcjs_enqueueswpheartbeatjs">trunk/src/js/_enqueues/wp/heartbeat.js</a></li>

<li><a href="#trunksrcjs_enqueueswpmceviewjs">trunk/src/js/_enqueues/wp/mce-view.js</a></li>

<li><a href="#trunksrcjs_enqueueswpmediaaudiovideojs">trunk/src/js/_enqueues/wp/media/audiovideo.js</a></li>

<li><a href="#trunksrcjs_enqueueswpmediaeditorjs">trunk/src/js/_enqueues/wp/media/editor.js</a></li>

<li><a href="#trunksrcjs_enqueueswpmediamodelsjs">trunk/src/js/_enqueues/wp/media/models.js</a></li>

<li><a href="#trunksrcjs_enqueueswpmediaviewsjs">trunk/src/js/_enqueues/wp/media/views.js</a></li>

<li><a href="#trunksrcjs_enqueueswpshortcodejs">trunk/src/js/_enqueues/wp/shortcode.js</a></li>

<li><a href="#trunksrcjs_enqueueswpsvgpainterjs">trunk/src/js/_enqueues/wp/svg-painter.js</a></li>

<li><a href="#trunksrcjs_enqueueswpthemeplugineditorjs">trunk/src/js/_enqueues/wp/theme-plugin-editor.js</a></li>

<li><a href="#trunksrcjs_enqueueswpthemejs">trunk/src/js/_enqueues/wp/theme.js</a></li>

<li><a href="#trunksrcjs_enqueueswputiljs">trunk/src/js/_enqueues/wp/util.js</a></li>

<li><a href="#trunksrcjs_enqueueswputilswordcountjs">trunk/src/js/_enqueues/wp/utils/word-count.js</a></li>

<li><a href="#trunksrcjsmediacontrollerscollectionaddjs">trunk/src/js/media/controllers/collection-add.js</a></li>

<li><a href="#trunksrcjsmediacontrollersembedjs">trunk/src/js/media/controllers/embed.js</a></li>

<li><a href="#trunksrcjsmediacontrollersstatejs">trunk/src/js/media/controllers/state.js</a></li>

<li><a href="#trunksrcjsmediamodelsattachmentsjs">trunk/src/js/media/models/attachments.js</a></li>

<li><a href="#trunksrcjsmediamodelspostimagejs">trunk/src/js/media/models/post-image.js</a></li>

<li><a href="#trunksrcjsmediamodelsqueryjs">trunk/src/js/media/models/query.js</a></li>

<li><a href="#trunksrcjsmediaroutersmanagejs">trunk/src/js/media/routers/manage.js</a></li>

<li><a href="#trunksrcjsmediautilsselectionsyncjs">trunk/src/js/media/utils/selection-sync.js</a></li>

<li><a href="#trunksrcjsmediaviewsattachmentdetailsjs">trunk/src/js/media/views/attachment/details.js</a></li>

<li><a href="#trunksrcjsmediaviewsattachmentjs">trunk/src/js/media/views/attachment.js</a></li>

<li><a href="#trunksrcjsmediaviewsattachmentsbrowserjs">trunk/src/js/media/views/attachments/browser.js</a></li>

<li><a href="#trunksrcjsmediaviewsattachmentsjs">trunk/src/js/media/views/attachments.js</a></li>

<li><a href="#trunksrcjsmediaviewsbuttonselectmodetogglejs">trunk/src/js/media/views/button/select-mode-toggle.js</a></li>

<li><a href="#trunksrcjsmediaviewsembedlinkjs">trunk/src/js/media/views/embed/link.js</a></li>

<li><a href="#trunksrcjsmediaviewsfocusmanagerjs">trunk/src/js/media/views/focus-manager.js</a></li>

<li><a href="#trunksrcjsmediaviewsframeeditattachmentsjs">trunk/src/js/media/views/frame/edit-attachments.js</a></li>

<li><a href="#trunksrcjsmediaviewsframeimagedetailsjs">trunk/src/js/media/views/frame/image-details.js</a></li>

<li><a href="#trunksrcjsmediaviewsframemanagejs">trunk/src/js/media/views/frame/manage.js</a></li>

<li><a href="#trunksrcjsmediaviewsframepostjs">trunk/src/js/media/views/frame/post.js</a></li>

<li><a href="#trunksrcjsmediaviewsframeselectjs">trunk/src/js/media/views/frame/select.js</a></li>

<li><a href="#trunksrcjsmediaviewsimagedetailsjs">trunk/src/js/media/views/image-details.js</a></li>

<li><a href="#trunksrcjsmediaviewsmenuitemjs">trunk/src/js/media/views/menu-item.js</a></li>

<li><a href="#trunksrcjsmediaviewsmodaljs">trunk/src/js/media/views/modal.js</a></li>

<li><a href="#trunksrcjsmediaviewstoolbarjs">trunk/src/js/media/views/toolbar.js</a></li>

<li><a href="#trunksrcjsmediaviewsuploaderinlinejs">trunk/src/js/media/views/uploader/inline.js</a></li>

<li><a href="#trunksrcjsmediaviewsviewjs">trunk/src/js/media/views/view.js</a></li>

<li><a href="#trunksrcwpactivatephp">trunk/src/wp-activate.php</a></li>

<li><a href="#trunksrcwpadmin_indexphp">trunk/src/wp-admin/_index.php</a></li>

<li><a href="#trunksrcwpadminadminajaxphp">trunk/src/wp-admin/admin-ajax.php</a></li>

<li><a href="#trunksrcwpadminadminfooterphp">trunk/src/wp-admin/admin-footer.php</a></li>

<li><a href="#trunksrcwpadminadminphp">trunk/src/wp-admin/admin.php</a></li>

<li><a href="#trunksrcwpadminasyncuploadphp">trunk/src/wp-admin/async-upload.php</a></li>

<li><a href="#trunksrcwpadmincommentphp">trunk/src/wp-admin/comment.php</a></li>

<li><a href="#trunksrcwpadmincreditsphp">trunk/src/wp-admin/credits.php</a></li>

<li><a href="#trunksrcwpadmineditcommentsphp">trunk/src/wp-admin/edit-comments.php</a></li>

<li><a href="#trunksrcwpadmineditformadvancedphp">trunk/src/wp-admin/edit-form-advanced.php</a></li>

<li><a href="#trunksrcwpadmineditformblocksphp">trunk/src/wp-admin/edit-form-blocks.php</a></li>

<li><a href="#trunksrcwpadmineditformcommentphp">trunk/src/wp-admin/edit-form-comment.php</a></li>

<li><a href="#trunksrcwpadmineditlinkformphp">trunk/src/wp-admin/edit-link-form.php</a></li>

<li><a href="#trunksrcwpadminedittagformphp">trunk/src/wp-admin/edit-tag-form.php</a></li>

<li><a href="#trunksrcwpadminedittagsphp">trunk/src/wp-admin/edit-tags.php</a></li>

<li><a href="#trunksrcwpadmineditphp">trunk/src/wp-admin/edit.php</a></li>

<li><a href="#trunksrcwpadminimportphp">trunk/src/wp-admin/import.php</a></li>

<li><a href="#trunksrcwpadminincludesadminfiltersphp">trunk/src/wp-admin/includes/admin-filters.php</a></li>

<li><a href="#trunksrcwpadminincludesadminphp">trunk/src/wp-admin/includes/admin.php</a></li>

<li><a href="#trunksrcwpadminincludesajaxactionsphp">trunk/src/wp-admin/includes/ajax-actions.php</a></li>

<li><a href="#trunksrcwpadminincludesclassautomaticupgraderskinphp">trunk/src/wp-admin/includes/class-automatic-upgrader-skin.php</a></li>

<li><a href="#trunksrcwpadminincludesclasscoreupgraderphp">trunk/src/wp-admin/includes/class-core-upgrader.php</a></li>

<li><a href="#trunksrcwpadminincludesclasscustombackgroundphp">trunk/src/wp-admin/includes/class-custom-background.php</a></li>

<li><a href="#trunksrcwpadminincludesclasscustomimageheaderphp">trunk/src/wp-admin/includes/class-custom-image-header.php</a></li>

<li><a href="#trunksrcwpadminincludesclassfileuploadupgraderphp">trunk/src/wp-admin/includes/class-file-upload-upgrader.php</a></li>

<li><a href="#trunksrcwpadminincludesclasslanguagepackupgraderphp">trunk/src/wp-admin/includes/class-language-pack-upgrader.php</a></li>

<li><a href="#trunksrcwpadminincludesclasspluginupgraderphp">trunk/src/wp-admin/includes/class-plugin-upgrader.php</a></li>

<li><a href="#trunksrcwpadminincludesclassthemeupgraderphp">trunk/src/wp-admin/includes/class-theme-upgrader.php</a></li>

<li><a href="#trunksrcwpadminincludesclasswalkercategorychecklistphp">trunk/src/wp-admin/includes/class-walker-category-checklist.php</a></li>

<li><a href="#trunksrcwpadminincludesclasswalkernavmenuchecklistphp">trunk/src/wp-admin/includes/class-walker-nav-menu-checklist.php</a></li>

<li><a href="#trunksrcwpadminincludesclasswalkernavmenueditphp">trunk/src/wp-admin/includes/class-walker-nav-menu-edit.php</a></li>

<li><a href="#trunksrcwpadminincludesclasswpautomaticupdaterphp">trunk/src/wp-admin/includes/class-wp-automatic-updater.php</a></li>

<li><a href="#trunksrcwpadminincludesclasswpcommentslisttablephp">trunk/src/wp-admin/includes/class-wp-comments-list-table.php</a></li>

<li><a href="#trunksrcwpadminincludesclasswpcommunityeventsphp">trunk/src/wp-admin/includes/class-wp-community-events.php</a></li>

<li><a href="#trunksrcwpadminincludesclasswpdebugdataphp">trunk/src/wp-admin/includes/class-wp-debug-data.php</a></li>

<li><a href="#trunksrcwpadminincludesclasswpfilesystembasephp">trunk/src/wp-admin/includes/class-wp-filesystem-base.php</a></li>

<li><a href="#trunksrcwpadminincludesclasswpfilesystemdirectphp">trunk/src/wp-admin/includes/class-wp-filesystem-direct.php</a></li>

<li><a href="#trunksrcwpadminincludesclasswpfilesystemftpextphp">trunk/src/wp-admin/includes/class-wp-filesystem-ftpext.php</a></li>

<li><a href="#trunksrcwpadminincludesclasswpfilesystemftpsocketsphp">trunk/src/wp-admin/includes/class-wp-filesystem-ftpsockets.php</a></li>

<li><a href="#trunksrcwpadminincludesclasswpfilesystemssh2php">trunk/src/wp-admin/includes/class-wp-filesystem-ssh2.php</a></li>

<li><a href="#trunksrcwpadminincludesclasswpimporterphp">trunk/src/wp-admin/includes/class-wp-importer.php</a></li>

<li><a href="#trunksrcwpadminincludesclasswpinternalpointersphp">trunk/src/wp-admin/includes/class-wp-internal-pointers.php</a></li>

<li><a href="#trunksrcwpadminincludesclasswplisttablephp">trunk/src/wp-admin/includes/class-wp-list-table.php</a></li>

<li><a href="#trunksrcwpadminincludesclasswpmssiteslisttablephp">trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php</a></li>

<li><a href="#trunksrcwpadminincludesclasswpmsthemeslisttablephp">trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php</a></li>

<li><a href="#trunksrcwpadminincludesclasswpmsuserslisttablephp">trunk/src/wp-admin/includes/class-wp-ms-users-list-table.php</a></li>

<li><a href="#trunksrcwpadminincludesclasswpplugininstalllisttablephp">trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php</a></li>

<li><a href="#trunksrcwpadminincludesclasswppluginslisttablephp">trunk/src/wp-admin/includes/class-wp-plugins-list-table.php</a></li>

<li><a href="#trunksrcwpadminincludesclasswppostslisttablephp">trunk/src/wp-admin/includes/class-wp-posts-list-table.php</a></li>

<li><a href="#trunksrcwpadminincludesclasswpprivacyrequeststablephp">trunk/src/wp-admin/includes/class-wp-privacy-requests-table.php</a></li>

<li><a href="#trunksrcwpadminincludesclasswpscreenphp">trunk/src/wp-admin/includes/class-wp-screen.php</a></li>

<li><a href="#trunksrcwpadminincludesclasswpsitehealthautoupdatesphp">trunk/src/wp-admin/includes/class-wp-site-health-auto-updates.php</a></li>

<li><a href="#trunksrcwpadminincludesclasswpsitehealthphp">trunk/src/wp-admin/includes/class-wp-site-health.php</a></li>

<li><a href="#trunksrcwpadminincludesclasswpsiteiconphp">trunk/src/wp-admin/includes/class-wp-site-icon.php</a></li>

<li><a href="#trunksrcwpadminincludesclasswptermslisttablephp">trunk/src/wp-admin/includes/class-wp-terms-list-table.php</a></li>

<li><a href="#trunksrcwpadminincludesclasswpthemeinstalllisttablephp">trunk/src/wp-admin/includes/class-wp-theme-install-list-table.php</a></li>

<li><a href="#trunksrcwpadminincludesclasswpthemeslisttablephp">trunk/src/wp-admin/includes/class-wp-themes-list-table.php</a></li>

<li><a href="#trunksrcwpadminincludesclasswpupgraderphp">trunk/src/wp-admin/includes/class-wp-upgrader.php</a></li>

<li><a href="#trunksrcwpadminincludesclasswpuserslisttablephp">trunk/src/wp-admin/includes/class-wp-users-list-table.php</a></li>

<li><a href="#trunksrcwpadminincludescommentphp">trunk/src/wp-admin/includes/comment.php</a></li>

<li><a href="#trunksrcwpadminincludescreditsphp">trunk/src/wp-admin/includes/credits.php</a></li>

<li><a href="#trunksrcwpadminincludesdashboardphp">trunk/src/wp-admin/includes/dashboard.php</a></li>

<li><a href="#trunksrcwpadminincludesfilephp">trunk/src/wp-admin/includes/file.php</a></li>

<li><a href="#trunksrcwpadminincludesimagephp">trunk/src/wp-admin/includes/image.php</a></li>

<li><a href="#trunksrcwpadminincludesimportphp">trunk/src/wp-admin/includes/import.php</a></li>

<li><a href="#trunksrcwpadminincludesmediaphp">trunk/src/wp-admin/includes/media.php</a></li>

<li><a href="#trunksrcwpadminincludesprivacytoolsphp">trunk/src/wp-admin/includes/privacy-tools.php</a></li>

<li><a href="#trunksrcwpadminincludesrevisionphp">trunk/src/wp-admin/includes/revision.php</a></li>

<li><a href="#trunksrcwpadminincludesschemaphp">trunk/src/wp-admin/includes/schema.php</a></li>

<li><a href="#trunksrcwpadminincludesscreenphp">trunk/src/wp-admin/includes/screen.php</a></li>

<li><a href="#trunksrcwpadminincludestaxonomyphp">trunk/src/wp-admin/includes/taxonomy.php</a></li>

<li><a href="#trunksrcwpadminincludestemplatephp">trunk/src/wp-admin/includes/template.php</a></li>

<li><a href="#trunksrcwpadminincludesthemephp">trunk/src/wp-admin/includes/theme.php</a></li>

<li><a href="#trunksrcwpadminincludestranslationinstallphp">trunk/src/wp-admin/includes/translation-install.php</a></li>

<li><a href="#trunksrcwpadminincludesupdatecorephp">trunk/src/wp-admin/includes/update-core.php</a></li>

<li><a href="#trunksrcwpadminincludesupdatephp">trunk/src/wp-admin/includes/update.php</a></li>

<li><a href="#trunksrcwpadminincludesupgradephp">trunk/src/wp-admin/includes/upgrade.php</a></li>

<li><a href="#trunksrcwpadminincludesuserphp">trunk/src/wp-admin/includes/user.php</a></li>

<li><a href="#trunksrcwpadminincludeswidgetsphp">trunk/src/wp-admin/includes/widgets.php</a></li>

<li><a href="#trunksrcwpadmininstallhelperphp">trunk/src/wp-admin/install-helper.php</a></li>

<li><a href="#trunksrcwpadmininstallphp">trunk/src/wp-admin/install.php</a></li>

<li><a href="#trunksrcwpadminlinkmanagerphp">trunk/src/wp-admin/link-manager.php</a></li>

<li><a href="#trunksrcwpadminlinkparseopmlphp">trunk/src/wp-admin/link-parse-opml.php</a></li>

<li><a href="#trunksrcwpadminloadscriptsphp">trunk/src/wp-admin/load-scripts.php</a></li>

<li><a href="#trunksrcwpadminloadstylesphp">trunk/src/wp-admin/load-styles.php</a></li>

<li><a href="#trunksrcwpadminmedianewphp">trunk/src/wp-admin/media-new.php</a></li>

<li><a href="#trunksrcwpadminmediauploadphp">trunk/src/wp-admin/media-upload.php</a></li>

<li><a href="#trunksrcwpadminmenuheaderphp">trunk/src/wp-admin/menu-header.php</a></li>

<li><a href="#trunksrcwpadminmenuphp">trunk/src/wp-admin/menu.php</a></li>

<li><a href="#trunksrcwpadminnavmenusphp">trunk/src/wp-admin/nav-menus.php</a></li>

<li><a href="#trunksrcwpadminnetworksettingsphp">trunk/src/wp-admin/network/settings.php</a></li>

<li><a href="#trunksrcwpadminnetworksitenewphp">trunk/src/wp-admin/network/site-new.php</a></li>

<li><a href="#trunksrcwpadminnetworksitesettingsphp">trunk/src/wp-admin/network/site-settings.php</a></li>

<li><a href="#trunksrcwpadminnetworkthemesphp">trunk/src/wp-admin/network/themes.php</a></li>

<li><a href="#trunksrcwpadminnetworkusersphp">trunk/src/wp-admin/network/users.php</a></li>

<li><a href="#trunksrcwpadminoptionsdiscussionphp">trunk/src/wp-admin/options-discussion.php</a></li>

<li><a href="#trunksrcwpadminoptionsgeneralphp">trunk/src/wp-admin/options-general.php</a></li>

<li><a href="#trunksrcwpadminoptionsmediaphp">trunk/src/wp-admin/options-media.php</a></li>

<li><a href="#trunksrcwpadminoptionspermalinkphp">trunk/src/wp-admin/options-permalink.php</a></li>

<li><a href="#trunksrcwpadminoptionsphp">trunk/src/wp-admin/options.php</a></li>

<li><a href="#trunksrcwpadminplugineditorphp">trunk/src/wp-admin/plugin-editor.php</a></li>

<li><a href="#trunksrcwpadminplugininstallphp">trunk/src/wp-admin/plugin-install.php</a></li>

<li><a href="#trunksrcwpadminpluginsphp">trunk/src/wp-admin/plugins.php</a></li>

<li><a href="#trunksrcwpadminpostnewphp">trunk/src/wp-admin/post-new.php</a></li>

<li><a href="#trunksrcwpadminpostphp">trunk/src/wp-admin/post.php</a></li>

<li><a href="#trunksrcwpadminrevisionphp">trunk/src/wp-admin/revision.php</a></li>

<li><a href="#trunksrcwpadminsetupconfigphp">trunk/src/wp-admin/setup-config.php</a></li>

<li><a href="#trunksrcwpadminthemeeditorphp">trunk/src/wp-admin/theme-editor.php</a></li>

<li><a href="#trunksrcwpadminthemeinstallphp">trunk/src/wp-admin/theme-install.php</a></li>

<li><a href="#trunksrcwpadminthemesphp">trunk/src/wp-admin/themes.php</a></li>

<li><a href="#trunksrcwpadminupdatecorephp">trunk/src/wp-admin/update-core.php</a></li>

<li><a href="#trunksrcwpadminupdatephp">trunk/src/wp-admin/update.php</a></li>

<li><a href="#trunksrcwpadminuploadphp">trunk/src/wp-admin/upload.php</a></li>

<li><a href="#trunksrcwpadminusereditphp">trunk/src/wp-admin/user-edit.php</a></li>

<li><a href="#trunksrcwpadminusernewphp">trunk/src/wp-admin/user-new.php</a></li>

<li><a href="#trunksrcwpadminusersphp">trunk/src/wp-admin/users.php</a></li>

<li><a href="#trunksrcwpadminwidgetsphp">trunk/src/wp-admin/widgets.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyelevenarchivephp">trunk/src/wp-content/themes/twentyeleven/archive.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyelevenauthorphp">trunk/src/wp-content/themes/twentyeleven/author.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyelevencategoryphp">trunk/src/wp-content/themes/twentyeleven/category.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyelevencommentsphp">trunk/src/wp-content/themes/twentyeleven/comments.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyelevencontentasidephp">trunk/src/wp-content/themes/twentyeleven/content-aside.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyelevencontentgalleryphp">trunk/src/wp-content/themes/twentyeleven/content-gallery.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyelevencontentimagephp">trunk/src/wp-content/themes/twentyeleven/content-image.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyelevencontentlinkphp">trunk/src/wp-content/themes/twentyeleven/content-link.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyelevencontentquotephp">trunk/src/wp-content/themes/twentyeleven/content-quote.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyelevencontentsinglephp">trunk/src/wp-content/themes/twentyeleven/content-single.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyelevencontentstatusphp">trunk/src/wp-content/themes/twentyeleven/content-status.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyelevencontentphp">trunk/src/wp-content/themes/twentyeleven/content.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyelevenfunctionsphp">trunk/src/wp-content/themes/twentyeleven/functions.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyelevenheaderphp">trunk/src/wp-content/themes/twentyeleven/header.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyelevenimagephp">trunk/src/wp-content/themes/twentyeleven/image.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyelevenincthemecustomizerjs">trunk/src/wp-content/themes/twentyeleven/inc/theme-customizer.js</a></li>

<li><a href="#trunksrcwpcontentthemestwentyelevenincthemeoptionsphp">trunk/src/wp-content/themes/twentyeleven/inc/theme-options.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyelevenincwidgetsphp">trunk/src/wp-content/themes/twentyeleven/inc/widgets.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyelevenindexphp">trunk/src/wp-content/themes/twentyeleven/index.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyelevenpagephp">trunk/src/wp-content/themes/twentyeleven/page.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyelevensearchphp">trunk/src/wp-content/themes/twentyeleven/search.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyelevenshowcasephp">trunk/src/wp-content/themes/twentyeleven/showcase.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyelevensidebarpagephp">trunk/src/wp-content/themes/twentyeleven/sidebar-page.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyelevensidebarphp">trunk/src/wp-content/themes/twentyeleven/sidebar.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyelevensinglephp">trunk/src/wp-content/themes/twentyeleven/single.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyeleventagphp">trunk/src/wp-content/themes/twentyeleven/tag.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyfifteenarchivephp">trunk/src/wp-content/themes/twentyfifteen/archive.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyfifteencommentsphp">trunk/src/wp-content/themes/twentyfifteen/comments.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyfifteencontentlinkphp">trunk/src/wp-content/themes/twentyfifteen/content-link.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyfifteencontentphp">trunk/src/wp-content/themes/twentyfifteen/content.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyfifteenfunctionsphp">trunk/src/wp-content/themes/twentyfifteen/functions.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyfifteenimagephp">trunk/src/wp-content/themes/twentyfifteen/image.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyfifteeninccustomheaderphp">trunk/src/wp-content/themes/twentyfifteen/inc/custom-header.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyfifteeninccustomizerphp">trunk/src/wp-content/themes/twentyfifteen/inc/customizer.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyfifteeninctemplatetagsphp">trunk/src/wp-content/themes/twentyfifteen/inc/template-tags.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyfifteenindexphp">trunk/src/wp-content/themes/twentyfifteen/index.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyfifteenjsfunctionsjs">trunk/src/wp-content/themes/twentyfifteen/js/functions.js</a></li>

<li><a href="#trunksrcwpcontentthemestwentyfifteensinglephp">trunk/src/wp-content/themes/twentyfifteen/single.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyfourteenarchivephp">trunk/src/wp-content/themes/twentyfourteen/archive.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyfourteenauthorphp">trunk/src/wp-content/themes/twentyfourteen/author.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyfourteencategoryphp">trunk/src/wp-content/themes/twentyfourteen/category.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyfourteencontentfeaturedpostphp">trunk/src/wp-content/themes/twentyfourteen/content-featured-post.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyfourteenfunctionsphp">trunk/src/wp-content/themes/twentyfourteen/functions.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyfourteenimagephp">trunk/src/wp-content/themes/twentyfourteen/image.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyfourteeninccustomheaderphp">trunk/src/wp-content/themes/twentyfourteen/inc/custom-header.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyfourteeninctemplatetagsphp">trunk/src/wp-content/themes/twentyfourteen/inc/template-tags.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyfourteenindexphp">trunk/src/wp-content/themes/twentyfourteen/index.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyfourteenjsfunctionsjs">trunk/src/wp-content/themes/twentyfourteen/js/functions.js</a></li>

<li><a href="#trunksrcwpcontentthemestwentyfourteenpagetemplatescontributorsphp">trunk/src/wp-content/themes/twentyfourteen/page-templates/contributors.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyfourteenpagetemplatesfullwidthphp">trunk/src/wp-content/themes/twentyfourteen/page-templates/full-width.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyfourteenpagephp">trunk/src/wp-content/themes/twentyfourteen/page.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyfourteensearchphp">trunk/src/wp-content/themes/twentyfourteen/search.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyfourteensinglephp">trunk/src/wp-content/themes/twentyfourteen/single.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyfourteentagphp">trunk/src/wp-content/themes/twentyfourteen/tag.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyfourteentaxonomypost_formatphp">trunk/src/wp-content/themes/twentyfourteen/taxonomy-post_format.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentynineteenarchivephp">trunk/src/wp-content/themes/twentynineteen/archive.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentynineteenclassesclasstwentynineteensvgiconsphp">trunk/src/wp-content/themes/twentynineteen/classes/class-twentynineteen-svg-icons.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentynineteencommentsphp">trunk/src/wp-content/themes/twentynineteen/comments.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentynineteenimagephp">trunk/src/wp-content/themes/twentynineteen/image.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentynineteeninctemplatefunctionsphp">trunk/src/wp-content/themes/twentynineteen/inc/template-functions.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentynineteeninctemplatetagsphp">trunk/src/wp-content/themes/twentynineteen/inc/template-tags.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentynineteenjscustomizepreviewjs">trunk/src/wp-content/themes/twentynineteen/js/customize-preview.js</a></li>

<li><a href="#trunksrcwpcontentthemestwentynineteenjsprioritymenujs">trunk/src/wp-content/themes/twentynineteen/js/priority-menu.js</a></li>

<li><a href="#trunksrcwpcontentthemestwentynineteenjstouchkeyboardnavigationjs">trunk/src/wp-content/themes/twentynineteen/js/touch-keyboard-navigation.js</a></li>

<li><a href="#trunksrcwpcontentthemestwentynineteenpagephp">trunk/src/wp-content/themes/twentynineteen/page.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentynineteensearchphp">trunk/src/wp-content/themes/twentynineteen/search.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentynineteensinglephp">trunk/src/wp-content/themes/twentynineteen/single.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentynineteentemplatepartsheaderentryheaderphp">trunk/src/wp-content/themes/twentynineteen/template-parts/header/entry-header.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyseventeenarchivephp">trunk/src/wp-content/themes/twentyseventeen/archive.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyseventeenassetsjscustomizepreviewjs">trunk/src/wp-content/themes/twentyseventeen/assets/js/customize-preview.js</a></li>

<li><a href="#trunksrcwpcontentthemestwentyseventeeninccustomheaderphp">trunk/src/wp-content/themes/twentyseventeen/inc/custom-header.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyseventeeninctemplatetagsphp">trunk/src/wp-content/themes/twentyseventeen/inc/template-tags.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyseventeenindexphp">trunk/src/wp-content/themes/twentyseventeen/index.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyseventeenpagephp">trunk/src/wp-content/themes/twentyseventeen/page.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyseventeensearchphp">trunk/src/wp-content/themes/twentyseventeen/search.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyseventeensinglephp">trunk/src/wp-content/themes/twentyseventeen/single.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentysixteenarchivephp">trunk/src/wp-content/themes/twentysixteen/archive.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentysixteenfunctionsphp">trunk/src/wp-content/themes/twentysixteen/functions.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentysixteenimagephp">trunk/src/wp-content/themes/twentysixteen/image.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentysixteeninccustomizerphp">trunk/src/wp-content/themes/twentysixteen/inc/customizer.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentysixteeninctemplatetagsphp">trunk/src/wp-content/themes/twentysixteen/inc/template-tags.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentysixteenindexphp">trunk/src/wp-content/themes/twentysixteen/index.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentysixteenpagephp">trunk/src/wp-content/themes/twentysixteen/page.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentysixteensinglephp">trunk/src/wp-content/themes/twentysixteen/single.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentyten404php">trunk/src/wp-content/themes/twentyten/404.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentytenarchivephp">trunk/src/wp-content/themes/twentyten/archive.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentytenauthorphp">trunk/src/wp-content/themes/twentyten/author.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentytencommentsphp">trunk/src/wp-content/themes/twentyten/comments.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentytenfunctionsphp">trunk/src/wp-content/themes/twentyten/functions.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentytenheaderphp">trunk/src/wp-content/themes/twentyten/header.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentytenloopattachmentphp">trunk/src/wp-content/themes/twentyten/loop-attachment.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentytenlooppagephp">trunk/src/wp-content/themes/twentyten/loop-page.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentytenloopsinglephp">trunk/src/wp-content/themes/twentyten/loop-single.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentytenloopphp">trunk/src/wp-content/themes/twentyten/loop.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentytensidebarphp">trunk/src/wp-content/themes/twentyten/sidebar.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentytentagphp">trunk/src/wp-content/themes/twentyten/tag.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentythirteenarchivephp">trunk/src/wp-content/themes/twentythirteen/archive.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentythirteenauthorphp">trunk/src/wp-content/themes/twentythirteen/author.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentythirteencategoryphp">trunk/src/wp-content/themes/twentythirteen/category.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentythirteencommentsphp">trunk/src/wp-content/themes/twentythirteen/comments.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentythirteencontentphp">trunk/src/wp-content/themes/twentythirteen/content.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentythirteenfunctionsphp">trunk/src/wp-content/themes/twentythirteen/functions.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentythirteenimagephp">trunk/src/wp-content/themes/twentythirteen/image.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentythirteenindexphp">trunk/src/wp-content/themes/twentythirteen/index.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentythirteenpagephp">trunk/src/wp-content/themes/twentythirteen/page.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentythirteensearchphp">trunk/src/wp-content/themes/twentythirteen/search.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentythirteensinglephp">trunk/src/wp-content/themes/twentythirteen/single.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentythirteentagphp">trunk/src/wp-content/themes/twentythirteen/tag.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentythirteentaxonomypost_formatphp">trunk/src/wp-content/themes/twentythirteen/taxonomy-post_format.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentytwelvearchivephp">trunk/src/wp-content/themes/twentytwelve/archive.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentytwelveauthorphp">trunk/src/wp-content/themes/twentytwelve/author.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentytwelvecategoryphp">trunk/src/wp-content/themes/twentytwelve/category.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentytwelvecommentsphp">trunk/src/wp-content/themes/twentytwelve/comments.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentytwelvecontentphp">trunk/src/wp-content/themes/twentytwelve/content.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentytwelvefunctionsphp">trunk/src/wp-content/themes/twentytwelve/functions.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentytwelveimagephp">trunk/src/wp-content/themes/twentytwelve/image.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentytwelveinccustomheaderphp">trunk/src/wp-content/themes/twentytwelve/inc/custom-header.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentytwelveindexphp">trunk/src/wp-content/themes/twentytwelve/index.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentytwelvejsthemecustomizerjs">trunk/src/wp-content/themes/twentytwelve/js/theme-customizer.js</a></li>

<li><a href="#trunksrcwpcontentthemestwentytwelvepagetemplatesfrontpagephp">trunk/src/wp-content/themes/twentytwelve/page-templates/front-page.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentytwelvepagetemplatesfullwidthphp">trunk/src/wp-content/themes/twentytwelve/page-templates/full-width.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentytwelvepagephp">trunk/src/wp-content/themes/twentytwelve/page.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentytwelvesearchphp">trunk/src/wp-content/themes/twentytwelve/search.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentytwelvesinglephp">trunk/src/wp-content/themes/twentytwelve/single.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentytwelvetagphp">trunk/src/wp-content/themes/twentytwelve/tag.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentytwentyassetsjscolorcalculationsjs">trunk/src/wp-content/themes/twentytwenty/assets/js/color-calculations.js</a></li>

<li><a href="#trunksrcwpcontentthemestwentytwentyassetsjscustomizepreviewjs">trunk/src/wp-content/themes/twentytwenty/assets/js/customize-preview.js</a></li>

<li><a href="#trunksrcwpcontentthemestwentytwentyassetsjsindexjs">trunk/src/wp-content/themes/twentytwenty/assets/js/index.js</a></li>

<li><a href="#trunksrcwpcontentthemestwentytwentyclassesclasstwentytwentynonlatinlanguagesphp">trunk/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-non-latin-languages.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentytwentyclassesclasstwentytwentyscriptloaderphp">trunk/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-script-loader.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentytwentyclassesclasstwentytwentysvgiconsphp">trunk/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-svg-icons.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentytwentyclassesclasstwentytwentywalkercommentphp">trunk/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-walker-comment.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentytwentyclassesclasstwentytwentywalkerpagephp">trunk/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-walker-page.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentytwentycommentsphp">trunk/src/wp-content/themes/twentytwenty/comments.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentytwentyfooterphp">trunk/src/wp-content/themes/twentytwenty/footer.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentytwentyfunctionsphp">trunk/src/wp-content/themes/twentytwenty/functions.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentytwentyinccustomcssphp">trunk/src/wp-content/themes/twentytwenty/inc/custom-css.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentytwentyincsvgiconsphp">trunk/src/wp-content/themes/twentytwenty/inc/svg-icons.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentytwentyinctemplatetagsphp">trunk/src/wp-content/themes/twentytwenty/inc/template-tags.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentytwentyindexphp">trunk/src/wp-content/themes/twentytwenty/index.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentytwentysearchformphp">trunk/src/wp-content/themes/twentytwenty/searchform.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentytwentytemplatepartscontentcoverphp">trunk/src/wp-content/themes/twentytwenty/template-parts/content-cover.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentytwentytemplatepartsentryauthorbiophp">trunk/src/wp-content/themes/twentytwenty/template-parts/entry-author-bio.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentytwentytemplatepartsentryheaderphp">trunk/src/wp-content/themes/twentytwenty/template-parts/entry-header.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentytwentytemplatepartsfeaturedimagephp">trunk/src/wp-content/themes/twentytwenty/template-parts/featured-image.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentytwentytemplatepartsfootermenuswidgetsphp">trunk/src/wp-content/themes/twentytwenty/template-parts/footer-menus-widgets.php</a></li>

<li><a href="#trunksrcwpcontentthemestwentytwentytemplatepartspaginationphp">trunk/src/wp-content/themes/twentytwenty/template-parts/pagination.php</a></li>

<li><a href="#trunksrcwpincludesadminbarphp">trunk/src/wp-includes/admin-bar.php</a></li>

<li><a href="#trunksrcwpincludesauthortemplatephp">trunk/src/wp-includes/author-template.php</a></li>

<li><a href="#trunksrcwpincludesbookmarktemplatephp">trunk/src/wp-includes/bookmark-template.php</a></li>

<li><a href="#trunksrcwpincludesbookmarkphp">trunk/src/wp-includes/bookmark.php</a></li>

<li><a href="#trunksrcwpincludescanonicalphp">trunk/src/wp-includes/canonical.php</a></li>

<li><a href="#trunksrcwpincludescapabilitiesphp">trunk/src/wp-includes/capabilities.php</a></li>

<li><a href="#trunksrcwpincludescategorytemplatephp">trunk/src/wp-includes/category-template.php</a></li>

<li><a href="#trunksrcwpincludescategoryphp">trunk/src/wp-includes/category.php</a></li>

<li><a href="#trunksrcwpincludesclasshttpphp">trunk/src/wp-includes/class-http.php</a></li>

<li><a href="#trunksrcwpincludesclasswalkernavmenuphp">trunk/src/wp-includes/class-walker-nav-menu.php</a></li>

<li><a href="#trunksrcwpincludesclasswpadminbarphp">trunk/src/wp-includes/class-wp-admin-bar.php</a></li>

<li><a href="#trunksrcwpincludesclasswpajaxresponsephp">trunk/src/wp-includes/class-wp-ajax-response.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="#trunksrcwpincludesclasswpcustomizesettingphp">trunk/src/wp-includes/class-wp-customize-setting.php</a></li>

<li><a href="#trunksrcwpincludesclasswpcustomizewidgetsphp">trunk/src/wp-includes/class-wp-customize-widgets.php</a></li>

<li><a href="#trunksrcwpincludesclasswpdatequeryphp">trunk/src/wp-includes/class-wp-date-query.php</a></li>

<li><a href="#trunksrcwpincludesclasswpeditorphp">trunk/src/wp-includes/class-wp-editor.php</a></li>

<li><a href="#trunksrcwpincludesclasswpembedphp">trunk/src/wp-includes/class-wp-embed.php</a></li>

<li><a href="#trunksrcwpincludesclasswpfatalerrorhandlerphp">trunk/src/wp-includes/class-wp-fatal-error-handler.php</a></li>

<li><a href="#trunksrcwpincludesclasswphookphp">trunk/src/wp-includes/class-wp-hook.php</a></li>

<li><a href="#trunksrcwpincludesclasswphttpixrclientphp">trunk/src/wp-includes/class-wp-http-ixr-client.php</a></li>

<li><a href="#trunksrcwpincludesclasswphttprequestshooksphp">trunk/src/wp-includes/class-wp-http-requests-hooks.php</a></li>

<li><a href="#trunksrcwpincludesclasswphttpstreamsphp">trunk/src/wp-includes/class-wp-http-streams.php</a></li>

<li><a href="#trunksrcwpincludesclasswpimageeditorgdphp">trunk/src/wp-includes/class-wp-image-editor-gd.php</a></li>

<li><a href="#trunksrcwpincludesclasswpimageeditorimagickphp">trunk/src/wp-includes/class-wp-image-editor-imagick.php</a></li>

<li><a href="#trunksrcwpincludesclasswpimageeditorphp">trunk/src/wp-includes/class-wp-image-editor.php</a></li>

<li><a href="#trunksrcwpincludesclasswplocalephp">trunk/src/wp-includes/class-wp-locale.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="#trunksrcwpincludesclasswpnetworkphp">trunk/src/wp-includes/class-wp-network.php</a></li>

<li><a href="#trunksrcwpincludesclasswpoembedphp">trunk/src/wp-includes/class-wp-oembed.php</a></li>

<li><a href="#trunksrcwpincludesclasswppausedextensionsstoragephp">trunk/src/wp-includes/class-wp-paused-extensions-storage.php</a></li>

<li><a href="#trunksrcwpincludesclasswpposttypephp">trunk/src/wp-includes/class-wp-post-type.php</a></li>

<li><a href="#trunksrcwpincludesclasswpqueryphp">trunk/src/wp-includes/class-wp-query.php</a></li>

<li><a href="#trunksrcwpincludesclasswprecoverymodecookieservicephp">trunk/src/wp-includes/class-wp-recovery-mode-cookie-service.php</a></li>

<li><a href="#trunksrcwpincludesclasswprecoverymodeemailservicephp">trunk/src/wp-includes/class-wp-recovery-mode-email-service.php</a></li>

<li><a href="#trunksrcwpincludesclasswprecoverymodekeyservicephp">trunk/src/wp-includes/class-wp-recovery-mode-key-service.php</a></li>

<li><a href="#trunksrcwpincludesclasswprecoverymodelinkservicephp">trunk/src/wp-includes/class-wp-recovery-mode-link-service.php</a></li>

<li><a href="#trunksrcwpincludesclasswprecoverymodephp">trunk/src/wp-includes/class-wp-recovery-mode.php</a></li>

<li><a href="#trunksrcwpincludesclasswprewritephp">trunk/src/wp-includes/class-wp-rewrite.php</a></li>

<li><a href="#trunksrcwpincludesclasswpsessiontokensphp">trunk/src/wp-includes/class-wp-session-tokens.php</a></li>

<li><a href="#trunksrcwpincludesclasswpsimplepiefilephp">trunk/src/wp-includes/class-wp-simplepie-file.php</a></li>

<li><a href="#trunksrcwpincludesclasswpsitequeryphp">trunk/src/wp-includes/class-wp-site-query.php</a></li>

<li><a href="#trunksrcwpincludesclasswptaxqueryphp">trunk/src/wp-includes/class-wp-tax-query.php</a></li>

<li><a href="#trunksrcwpincludesclasswptaxonomyphp">trunk/src/wp-includes/class-wp-taxonomy.php</a></li>

<li><a href="#trunksrcwpincludesclasswptextdiffrenderertablephp">trunk/src/wp-includes/class-wp-text-diff-renderer-table.php</a></li>

<li><a href="#trunksrcwpincludesclasswpthemephp">trunk/src/wp-includes/class-wp-theme.php</a></li>

<li><a href="#trunksrcwpincludesclasswpuserqueryphp">trunk/src/wp-includes/class-wp-user-query.php</a></li>

<li><a href="#trunksrcwpincludesclasswpuserphp">trunk/src/wp-includes/class-wp-user.php</a></li>

<li><a href="#trunksrcwpincludesclasswpwalkerphp">trunk/src/wp-includes/class-wp-walker.php</a></li>

<li><a href="#trunksrcwpincludesclasswpwidgetfactoryphp">trunk/src/wp-includes/class-wp-widget-factory.php</a></li>

<li><a href="#trunksrcwpincludesclasswpwidgetphp">trunk/src/wp-includes/class-wp-widget.php</a></li>

<li><a href="#trunksrcwpincludesclasswpxmlrpcserverphp">trunk/src/wp-includes/class-wp-xmlrpc-server.php</a></li>

<li><a href="#trunksrcwpincludesclasswpphp">trunk/src/wp-includes/class-wp.php</a></li>

<li><a href="#trunksrcwpincludesclasswpdependenciesphp">trunk/src/wp-includes/class.wp-dependencies.php</a></li>

<li><a href="#trunksrcwpincludescommenttemplatephp">trunk/src/wp-includes/comment-template.php</a></li>

<li><a href="#trunksrcwpincludescommentphp">trunk/src/wp-includes/comment.php</a></li>

<li><a href="#trunksrcwpincludescompatphp">trunk/src/wp-includes/compat.php</a></li>

<li><a href="#trunksrcwpincludescronphp">trunk/src/wp-includes/cron.php</a></li>

<li><a href="#trunksrcwpincludescustomizeclasswpcustomizenavmenusettingphp">trunk/src/wp-includes/customize/class-wp-customize-nav-menu-setting.php</a></li>

<li><a href="#trunksrcwpincludescustomizeclasswpcustomizethemessectionphp">trunk/src/wp-includes/customize/class-wp-customize-themes-section.php</a></li>

<li><a href="#trunksrcwpincludescustomizeclasswpcustomizeuploadcontrolphp">trunk/src/wp-includes/customize/class-wp-customize-upload-control.php</a></li>

<li><a href="#trunksrcwpincludesdefaultconstantsphp">trunk/src/wp-includes/default-constants.php</a></li>

<li><a href="#trunksrcwpincludesdefaultfiltersphp">trunk/src/wp-includes/default-filters.php</a></li>

<li><a href="#trunksrcwpincludesdeprecatedphp">trunk/src/wp-includes/deprecated.php</a></li>

<li><a href="#trunksrcwpincludeserrorprotectionphp">trunk/src/wp-includes/error-protection.php</a></li>

<li><a href="#trunksrcwpincludesfeedatomcommentsphp">trunk/src/wp-includes/feed-atom-comments.php</a></li>

<li><a href="#trunksrcwpincludesfeedatomphp">trunk/src/wp-includes/feed-atom.php</a></li>

<li><a href="#trunksrcwpincludesfeedrdfphp">trunk/src/wp-includes/feed-rdf.php</a></li>

<li><a href="#trunksrcwpincludesfeedrssphp">trunk/src/wp-includes/feed-rss.php</a></li>

<li><a href="#trunksrcwpincludesfeedrss2commentsphp">trunk/src/wp-includes/feed-rss2-comments.php</a></li>

<li><a href="#trunksrcwpincludesfeedrss2php">trunk/src/wp-includes/feed-rss2.php</a></li>

<li><a href="#trunksrcwpincludesfeedphp">trunk/src/wp-includes/feed.php</a></li>

<li><a href="#trunksrcwpincludesformattingphp">trunk/src/wp-includes/formatting.php</a></li>

<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</a></li>

<li><a href="#trunksrcwpincludesfunctionswpscriptsphp">trunk/src/wp-includes/functions.wp-scripts.php</a></li>

<li><a href="#trunksrcwpincludesfunctionswpstylesphp">trunk/src/wp-includes/functions.wp-styles.php</a></li>

<li><a href="#trunksrcwpincludesgeneraltemplatephp">trunk/src/wp-includes/general-template.php</a></li>

<li><a href="#trunksrcwpincludeshttpphp">trunk/src/wp-includes/http.php</a></li>

<li><a href="#trunksrcwpincludesksesphp">trunk/src/wp-includes/kses.php</a></li>

<li><a href="#trunksrcwpincludeslinktemplatephp">trunk/src/wp-includes/link-template.php</a></li>

<li><a href="#trunksrcwpincludesloadphp">trunk/src/wp-includes/load.php</a></li>

<li><a href="#trunksrcwpincludesmediaphp">trunk/src/wp-includes/media.php</a></li>

<li><a href="#trunksrcwpincludesmetaphp">trunk/src/wp-includes/meta.php</a></li>

<li><a href="#trunksrcwpincludesmsblogsphp">trunk/src/wp-includes/ms-blogs.php</a></li>

<li><a href="#trunksrcwpincludesmsdefaultconstantsphp">trunk/src/wp-includes/ms-default-constants.php</a></li>

<li><a href="#trunksrcwpincludesmsdefaultfiltersphp">trunk/src/wp-includes/ms-default-filters.php</a></li>

<li><a href="#trunksrcwpincludesmsdeprecatedphp">trunk/src/wp-includes/ms-deprecated.php</a></li>

<li><a href="#trunksrcwpincludesmsfilesphp">trunk/src/wp-includes/ms-files.php</a></li>

<li><a href="#trunksrcwpincludesmsfunctionsphp">trunk/src/wp-includes/ms-functions.php</a></li>

<li><a href="#trunksrcwpincludesmsloadphp">trunk/src/wp-includes/ms-load.php</a></li>

<li><a href="#trunksrcwpincludesmssettingsphp">trunk/src/wp-includes/ms-settings.php</a></li>

<li><a href="#trunksrcwpincludesmssitephp">trunk/src/wp-includes/ms-site.php</a></li>

<li><a href="#trunksrcwpincludesnavmenutemplatephp">trunk/src/wp-includes/nav-menu-template.php</a></li>

<li><a href="#trunksrcwpincludesnavmenuphp">trunk/src/wp-includes/nav-menu.php</a></li>

<li><a href="#trunksrcwpincludesoptionphp">trunk/src/wp-includes/option.php</a></li>

<li><a href="#trunksrcwpincludespluggablephp">trunk/src/wp-includes/pluggable.php</a></li>

<li><a href="#trunksrcwpincludespluginphp">trunk/src/wp-includes/plugin.php</a></li>

<li><a href="#trunksrcwpincludespomoentryphp">trunk/src/wp-includes/pomo/entry.php</a></li>

<li><a href="#trunksrcwpincludespomomophp">trunk/src/wp-includes/pomo/mo.php</a></li>

<li><a href="#trunksrcwpincludespomopluralformsphp">trunk/src/wp-includes/pomo/plural-forms.php</a></li>

<li><a href="#trunksrcwpincludespomopophp">trunk/src/wp-includes/pomo/po.php</a></li>

<li><a href="#trunksrcwpincludespomotranslationsphp">trunk/src/wp-includes/pomo/translations.php</a></li>

<li><a href="#trunksrcwpincludespostformatsphp">trunk/src/wp-includes/post-formats.php</a></li>

<li><a href="#trunksrcwpincludesposttemplatephp">trunk/src/wp-includes/post-template.php</a></li>

<li><a href="#trunksrcwpincludespostphp">trunk/src/wp-includes/post.php</a></li>

<li><a href="#trunksrcwpincludesqueryphp">trunk/src/wp-includes/query.php</a></li>

<li><a href="#trunksrcwpincludesrestapiclasswprestrequestphp">trunk/src/wp-includes/rest-api/class-wp-rest-request.php</a></li>

<li><a href="#trunksrcwpincludesrestapiclasswprestresponsephp">trunk/src/wp-includes/rest-api/class-wp-rest-response.php</a></li>

<li><a href="#trunksrcwpincludesrestapiclasswprestserverphp">trunk/src/wp-includes/rest-api/class-wp-rest-server.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="#trunksrcwpincludesrestapiendpointsclasswprestautosavescontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-autosaves-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="#trunksrcwpincludesrestapiendpointsclasswprestcommentscontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php</a></li>

<li><a href="#trunksrcwpincludesrestapiendpointsclasswprestcontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-controller.php</a></li>

<li><a href="#trunksrcwpincludesrestapiendpointsclasswprestpoststatusescontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-post-statuses-controller.php</a></li>

<li><a href="#trunksrcwpincludesrestapiendpointsclasswprestposttypescontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-post-types-controller.php</a></li>

<li><a href="#trunksrcwpincludesrestapiendpointsclasswprestpostscontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php</a></li>

<li><a href="#trunksrcwpincludesrestapiendpointsclasswprestrevisionscontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-revisions-controller.php</a></li>

<li><a href="#trunksrcwpincludesrestapiendpointsclasswprestsearchcontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-search-controller.php</a></li>

<li><a href="#trunksrcwpincludesrestapiendpointsclasswprestsettingscontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-settings-controller.php</a></li>

<li><a href="#trunksrcwpincludesrestapiendpointsclasswpresttaxonomiescontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-taxonomies-controller.php</a></li>

<li><a href="#trunksrcwpincludesrestapiendpointsclasswpresttermscontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php</a></li>

<li><a href="#trunksrcwpincludesrestapiendpointsclasswprestthemescontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-themes-controller.php</a></li>

<li><a href="#trunksrcwpincludesrestapiendpointsclasswprestuserscontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php</a></li>

<li><a href="#trunksrcwpincludesrestapifieldsclasswprestmetafieldsphp">trunk/src/wp-includes/rest-api/fields/class-wp-rest-meta-fields.php</a></li>

<li><a href="#trunksrcwpincludesrestapiphp">trunk/src/wp-includes/rest-api.php</a></li>

<li><a href="#trunksrcwpincludesrevisionphp">trunk/src/wp-includes/revision.php</a></li>

<li><a href="#trunksrcwpincludesrewritephp">trunk/src/wp-includes/rewrite.php</a></li>

<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>

<li><a href="#trunksrcwpincludesshortcodesphp">trunk/src/wp-includes/shortcodes.php</a></li>

<li><a href="#trunksrcwpincludestaxonomyphp">trunk/src/wp-includes/taxonomy.php</a></li>

<li><a href="#trunksrcwpincludestemplatephp">trunk/src/wp-includes/template.php</a></li>

<li><a href="#trunksrcwpincludesthemecompatcommentsphp">trunk/src/wp-includes/theme-compat/comments.php</a></li>

<li><a href="#trunksrcwpincludesthemecompatheaderphp">trunk/src/wp-includes/theme-compat/header.php</a></li>

<li><a href="#trunksrcwpincludesthemephp">trunk/src/wp-includes/theme.php</a></li>

<li><a href="#trunksrcwpincludesupdatephp">trunk/src/wp-includes/update.php</a></li>

<li><a href="#trunksrcwpincludesuserphp">trunk/src/wp-includes/user.php</a></li>

<li><a href="#trunksrcwpincludesvarsphp">trunk/src/wp-includes/vars.php</a></li>

<li><a href="#trunksrcwpincludeswidgetsclasswpnavmenuwidgetphp">trunk/src/wp-includes/widgets/class-wp-nav-menu-widget.php</a></li>

<li><a href="#trunksrcwpincludeswidgetsclasswpwidgetcategoriesphp">trunk/src/wp-includes/widgets/class-wp-widget-categories.php</a></li>

<li><a href="#trunksrcwpincludeswidgetsclasswpwidgetcustomhtmlphp">trunk/src/wp-includes/widgets/class-wp-widget-custom-html.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="#trunksrcwpincludeswidgetsclasswpwidgetpagesphp">trunk/src/wp-includes/widgets/class-wp-widget-pages.php</a></li>

<li><a href="#trunksrcwpincludeswidgetsclasswpwidgetrecentcommentsphp">trunk/src/wp-includes/widgets/class-wp-widget-recent-comments.php</a></li>

<li><a href="#trunksrcwpincludeswidgetsclasswpwidgetrssphp">trunk/src/wp-includes/widgets/class-wp-widget-rss.php</a></li>

<li><a href="#trunksrcwpincludeswidgetsclasswpwidgetsearchphp">trunk/src/wp-includes/widgets/class-wp-widget-search.php</a></li>

<li><a href="#trunksrcwpincludeswidgetsclasswpwidgettagcloudphp">trunk/src/wp-includes/widgets/class-wp-widget-tag-cloud.php</a></li>

<li><a href="#trunksrcwpincludeswidgetsclasswpwidgettextphp">trunk/src/wp-includes/widgets/class-wp-widget-text.php</a></li>

<li><a href="#trunksrcwpincludeswidgetsphp">trunk/src/wp-includes/widgets.php</a></li>

<li><a href="#trunksrcwpincludeswpdbphp">trunk/src/wp-includes/wp-db.php</a></li>

<li><a href="#trunksrcwploadphp">trunk/src/wp-load.php</a></li>

<li><a href="#trunksrcwploginphp">trunk/src/wp-login.php</a></li>

<li><a href="#trunksrcwpmailphp">trunk/src/wp-mail.php</a></li>

<li><a href="#trunksrcwpsettingsphp">trunk/src/wp-settings.php</a></li>

<li><a href="#trunksrcwpsignupphp">trunk/src/wp-signup.php</a></li>

<li><a href="#trunksrcxmlrpcphp">trunk/src/xmlrpc.php</a></li>

<li><a href="#trunktestsphpunitdataWPHTTPtestcaseredirectionscriptphp">trunk/tests/phpunit/data/WPHTTP-testcase-redirection-script.php</a></li>

<li><a href="#trunktestsphpunitdataformattingwholepostsphp">trunk/tests/phpunit/data/formatting/whole-posts.php</a></li>

<li><a href="#trunktestsphpunitdatathemedir1camelCaseindexphp">trunk/tests/phpunit/data/themedir1/camelCase/index.php</a></li>

<li><a href="#trunktestsphpunitdatathemedir1defaultcommentsphp">trunk/tests/phpunit/data/themedir1/default/comments.php</a></li>

<li><a href="#trunktestsphpunitdatathemedir1defaultfunctionsphp">trunk/tests/phpunit/data/themedir1/default/functions.php</a></li>

<li><a href="#trunktestsphpunitdatathemedir1pagetemplatesindexphp">trunk/tests/phpunit/data/themedir1/page-templates/index.php</a></li>

<li><a href="#trunktestsphpunitdatathemedir1sandboxfunctionsphp">trunk/tests/phpunit/data/themedir1/sandbox/functions.php</a></li>

<li><a href="#trunktestsphpunitdatathemedir1sandboxindexphp">trunk/tests/phpunit/data/themedir1/sandbox/index.php</a></li>

<li><a href="#trunktestsphpunitdatathemedir1theme1functionsphp">trunk/tests/phpunit/data/themedir1/theme1/functions.php</a></li>

<li><a href="#trunktestsphpunitdatathemedir1theme1indexphp">trunk/tests/phpunit/data/themedir1/theme1/index.php</a></li>

<li><a href="#trunktestsphpunitdatathemedir1theme1dupefunctionsphp">trunk/tests/phpunit/data/themedir1/theme1-dupe/functions.php</a></li>

<li><a href="#trunktestsphpunitdatathemedir1theme1dupeindexphp">trunk/tests/phpunit/data/themedir1/theme1-dupe/index.php</a></li>

<li><a href="#trunktestsphpunitincludesabstracttestcasephp">trunk/tests/phpunit/includes/abstract-testcase.php</a></li>

<li><a href="#trunktestsphpunitincludesbootstrapphp">trunk/tests/phpunit/includes/bootstrap.php</a></li>

<li><a href="#trunktestsphpunitincludesfactoryclasswpunittestfactoryforattachmentphp">trunk/tests/phpunit/includes/factory/class-wp-unittest-factory-for-attachment.php</a></li>

<li><a href="#trunktestsphpunitincludesfunctionsphp">trunk/tests/phpunit/includes/functions.php</a></li>

<li><a href="#trunktestsphpunitincludesinstallphp">trunk/tests/phpunit/includes/install.php</a></li>

<li><a href="#trunktestsphpunitincludesmockfsphp">trunk/tests/phpunit/includes/mock-fs.php</a></li>

<li><a href="#trunktestsphpunitincludesphpunit7speedtraplistenerphp">trunk/tests/phpunit/includes/phpunit7/speed-trap-listener.php</a></li>

<li><a href="#trunktestsphpunitincludesspeedtraplistenerphp">trunk/tests/phpunit/includes/speed-trap-listener.php</a></li>

<li><a href="#trunktestsphpunitincludestestcaseajaxphp">trunk/tests/phpunit/includes/testcase-ajax.php</a></li>

<li><a href="#trunktestsphpunitincludestestcasecanonicalphp">trunk/tests/phpunit/includes/testcase-canonical.php</a></li>

<li><a href="#trunktestsphpunitincludestestcaserestposttypecontrollerphp">trunk/tests/phpunit/includes/testcase-rest-post-type-controller.php</a></li>

<li><a href="#trunktestsphpunitincludestracphp">trunk/tests/phpunit/includes/trac.php</a></li>

<li><a href="#trunktestsphpunitincludesutilsphp">trunk/tests/phpunit/includes/utils.php</a></li>

<li><a href="#trunktestsphpunitincludeswpprofilerphp">trunk/tests/phpunit/includes/wp-profiler.php</a></li>

<li><a href="#trunktestsphpunitmultisitexml">trunk/tests/phpunit/multisite.xml</a></li>

<li><a href="#trunktestsphpunittestsactionsphp">trunk/tests/phpunit/tests/actions.php</a></li>

<li><a href="#trunktestsphpunittestsadminincludesListTablephp">trunk/tests/phpunit/tests/admin/includesListTable.php</a></li>

<li><a href="#trunktestsphpunittestsadminincludesMiscphp">trunk/tests/phpunit/tests/admin/includesMisc.php</a></li>

<li><a href="#trunktestsphpunittestsadminincludesPluginphp">trunk/tests/phpunit/tests/admin/includesPlugin.php</a></li>

<li><a href="#trunktestsphpunittestsadminincludesPostphp">trunk/tests/phpunit/tests/admin/includesPost.php</a></li>

<li><a href="#trunktestsphpunittestsadminincludesScreenphp">trunk/tests/phpunit/tests/admin/includesScreen.php</a></li>

<li><a href="#trunktestsphpunittestsadminincludesTemplatephp">trunk/tests/phpunit/tests/admin/includesTemplate.php</a></li>

<li><a href="#trunktestsphpunittestsadminincludesThemephp">trunk/tests/phpunit/tests/admin/includesTheme.php</a></li>

<li><a href="#trunktestsphpunittestsadminbarphp">trunk/tests/phpunit/tests/adminbar.php</a></li>

<li><a href="#trunktestsphpunittestsajaxAddMetaphp">trunk/tests/phpunit/tests/ajax/AddMeta.php</a></li>

<li><a href="#trunktestsphpunittestsajaxAttachmentsphp">trunk/tests/phpunit/tests/ajax/Attachments.php</a></li>

<li><a href="#trunktestsphpunittestsajaxAutosavephp">trunk/tests/phpunit/tests/ajax/Autosave.php</a></li>

<li><a href="#trunktestsphpunittestsajaxCompressionphp">trunk/tests/phpunit/tests/ajax/Compression.php</a></li>

<li><a href="#trunktestsphpunittestsajaxCustomizeManagerphp">trunk/tests/phpunit/tests/ajax/CustomizeManager.php</a></li>

<li><a href="#trunktestsphpunittestsajaxCustomizeMenusphp">trunk/tests/phpunit/tests/ajax/CustomizeMenus.php</a></li>

<li><a href="#trunktestsphpunittestsajaxDeleteCommentphp">trunk/tests/phpunit/tests/ajax/DeleteComment.php</a></li>

<li><a href="#trunktestsphpunittestsajaxDeletePluginphp">trunk/tests/phpunit/tests/ajax/DeletePlugin.php</a></li>

<li><a href="#trunktestsphpunittestsajaxDimCommentphp">trunk/tests/phpunit/tests/ajax/DimComment.php</a></li>

<li><a href="#trunktestsphpunittestsajaxEditCommentphp">trunk/tests/phpunit/tests/ajax/EditComment.php</a></li>

<li><a href="#trunktestsphpunittestsajaxGetCommentsphp">trunk/tests/phpunit/tests/ajax/GetComments.php</a></li>

<li><a href="#trunktestsphpunittestsajaxManageThemesphp">trunk/tests/phpunit/tests/ajax/ManageThemes.php</a></li>

<li><a href="#trunktestsphpunittestsajaxMediaEditphp">trunk/tests/phpunit/tests/ajax/MediaEdit.php</a></li>

<li><a href="#trunktestsphpunittestsajaxPrivacyErasePersonalDataphp">trunk/tests/phpunit/tests/ajax/PrivacyErasePersonalData.php</a></li>

<li><a href="#trunktestsphpunittestsajaxPrivacyExportPersonalDataphp">trunk/tests/phpunit/tests/ajax/PrivacyExportPersonalData.php</a></li>

<li><a href="#trunktestsphpunittestsajaxQuickEditphp">trunk/tests/phpunit/tests/ajax/QuickEdit.php</a></li>

<li><a href="#trunktestsphpunittestsajaxReplytoCommentphp">trunk/tests/phpunit/tests/ajax/ReplytoComment.php</a></li>

<li><a href="#trunktestsphpunittestsajaxResponsephp">trunk/tests/phpunit/tests/ajax/Response.php</a></li>

<li><a href="#trunktestsphpunittestsajaxTagSearchphp">trunk/tests/phpunit/tests/ajax/TagSearch.php</a></li>

<li><a href="#trunktestsphpunittestsajaxUpdatePluginphp">trunk/tests/phpunit/tests/ajax/UpdatePlugin.php</a></li>

<li><a href="#trunktestsphpunittestsattachmentslashesphp">trunk/tests/phpunit/tests/attachment/slashes.php</a></li>

<li><a href="#trunktestsphpunittestsauthphp">trunk/tests/phpunit/tests/auth.php</a></li>

<li><a href="#trunktestsphpunittestsbasicphp">trunk/tests/phpunit/tests/basic.php</a></li>

<li><a href="#trunktestsphpunittestsbookmarkgetBookmarksphp">trunk/tests/phpunit/tests/bookmark/getBookmarks.php</a></li>

<li><a href="#trunktestsphpunittestscachephp">trunk/tests/phpunit/tests/cache.php</a></li>

<li><a href="#trunktestsphpunittestscanonicalcategoryphp">trunk/tests/phpunit/tests/canonical/category.php</a></li>

<li><a href="#trunktestsphpunittestscanonicalcustomRulesphp">trunk/tests/phpunit/tests/canonical/customRules.php</a></li>

<li><a href="#trunktestsphpunittestscanonicalnoRewritephp">trunk/tests/phpunit/tests/canonical/noRewrite.php</a></li>

<li><a href="#trunktestsphpunittestscanonicalpageOnFrontphp">trunk/tests/phpunit/tests/canonical/pageOnFront.php</a></li>

<li><a href="#trunktestsphpunittestscanonicalphp">trunk/tests/phpunit/tests/canonical.php</a></li>

<li><a href="#trunktestsphpunittestscategoryphp">trunk/tests/phpunit/tests/category.php</a></li>

<li><a href="#trunktestsphpunittestscommentdateQueryphp">trunk/tests/phpunit/tests/comment/dateQuery.php</a></li>

<li><a href="#trunktestsphpunittestscommentgetCommentsPagesCountphp">trunk/tests/phpunit/tests/comment/getCommentsPagesCount.php</a></li>

<li><a href="#trunktestsphpunittestscommentgetPageOfCommentphp">trunk/tests/phpunit/tests/comment/getPageOfComment.php</a></li>

<li><a href="#trunktestsphpunittestscommentqueryphp">trunk/tests/phpunit/tests/comment/query.php</a></li>

<li><a href="#trunktestsphpunittestscommentslashesphp">trunk/tests/phpunit/tests/comment/slashes.php</a></li>

<li><a href="#trunktestsphpunittestscommenttemplatephp">trunk/tests/phpunit/tests/comment/template.php</a></li>

<li><a href="#trunktestsphpunittestscommentwalkerphp">trunk/tests/phpunit/tests/comment/walker.php</a></li>

<li><a href="#trunktestsphpunittestscommentwpListCommentsphp">trunk/tests/phpunit/tests/comment/wpListComments.php</a></li>

<li><a href="#trunktestsphpunittestscommentsubmissionphp">trunk/tests/phpunit/tests/comment-submission.php</a></li>

<li><a href="#trunktestsphpunittestscommentphp">trunk/tests/phpunit/tests/comment.php</a></li>

<li><a href="#trunktestsphpunittestscompatphp">trunk/tests/phpunit/tests/compat.php</a></li>

<li><a href="#trunktestsphpunittestscronphp">trunk/tests/phpunit/tests/cron.php</a></li>

<li><a href="#trunktestsphpunittestscustomizemanagerphp">trunk/tests/phpunit/tests/customize/manager.php</a></li>

<li><a href="#trunktestsphpunittestscustomizesettingphp">trunk/tests/phpunit/tests/customize/setting.php</a></li>

<li><a href="#trunktestsphpunittestscustomizewidgetsphp">trunk/tests/phpunit/tests/customize/widgets.php</a></li>

<li><a href="#trunktestsphpunittestsdatequeryphp">trunk/tests/phpunit/tests/date/query.php</a></li>

<li><a href="#trunktestsphpunittestsdbcharsetphp">trunk/tests/phpunit/tests/db/charset.php</a></li>

<li><a href="#trunktestsphpunittestsdbphp">trunk/tests/phpunit/tests/db.php</a></li>

<li><a href="#trunktestsphpunittestsdbdeltaphp">trunk/tests/phpunit/tests/dbdelta.php</a></li>

<li><a href="#trunktestsphpunittestsdependenciesscriptsphp">trunk/tests/phpunit/tests/dependencies/scripts.php</a></li>

<li><a href="#trunktestsphpunittestsdependenciesstylesphp">trunk/tests/phpunit/tests/dependencies/styles.php</a></li>

<li><a href="#trunktestsphpunittestsdependenciesphp">trunk/tests/phpunit/tests/dependencies.php</a></li>

<li><a href="#trunktestsphpunittestserrorprotectionrecoverymodekeyservicephp">trunk/tests/phpunit/tests/error-protection/recovery-mode-key-service.php</a></li>

<li><a href="#trunktestsphpunittestsexternalhttpbasicphp">trunk/tests/phpunit/tests/external-http/basic.php</a></li>

<li><a href="#trunktestsphpunittestsfeedatomphp">trunk/tests/phpunit/tests/feed/atom.php</a></li>

<li><a href="#trunktestsphpunittestsfeedrss2php">trunk/tests/phpunit/tests/feed/rss2.php</a></li>

<li><a href="#trunktestsphpunittestsfilephp">trunk/tests/phpunit/tests/file.php</a></li>

<li><a href="#trunktestsphpunittestsfilesystembasephp">trunk/tests/phpunit/tests/filesystem/base.php</a></li>

<li><a href="#trunktestsphpunittestsfilesystemfindFolderphp">trunk/tests/phpunit/tests/filesystem/findFolder.php</a></li>

<li><a href="#trunktestsphpunittestsfiltersphp">trunk/tests/phpunit/tests/filters.php</a></li>

<li><a href="#trunktestsphpunittestsformattingAutopphp">trunk/tests/phpunit/tests/formatting/Autop.php</a></li>

<li><a href="#trunktestsphpunittestsformattingBlogInfophp">trunk/tests/phpunit/tests/formatting/BlogInfo.php</a></li>

<li><a href="#trunktestsphpunittestsformattingEmojiphp">trunk/tests/phpunit/tests/formatting/Emoji.php</a></li>

<li><a href="#trunktestsphpunittestsformattingEscHtmlphp">trunk/tests/phpunit/tests/formatting/EscHtml.php</a></li>

<li><a href="#trunktestsphpunittestsformattingEscUrlphp">trunk/tests/phpunit/tests/formatting/EscUrl.php</a></li>

<li><a href="#trunktestsphpunittestsformattingGetUrlInContentphp">trunk/tests/phpunit/tests/formatting/GetUrlInContent.php</a></li>

<li><a href="#trunktestsphpunittestsformattingJSEscapephp">trunk/tests/phpunit/tests/formatting/JSEscape.php</a></li>

<li><a href="#trunktestsphpunittestsformattingLikeEscapephp">trunk/tests/phpunit/tests/formatting/LikeEscape.php</a></li>

<li><a href="#trunktestsphpunittestsformattingMakeClickablephp">trunk/tests/phpunit/tests/formatting/MakeClickable.php</a></li>

<li><a href="#trunktestsphpunittestsformattingRemoveAccentsphp">trunk/tests/phpunit/tests/formatting/RemoveAccents.php</a></li>

<li><a href="#trunktestsphpunittestsformattingSanitizeMimeTypephp">trunk/tests/phpunit/tests/formatting/SanitizeMimeType.php</a></li>

<li><a href="#trunktestsphpunittestsformattingSanitizeTextFieldphp">trunk/tests/phpunit/tests/formatting/SanitizeTextField.php</a></li>

<li><a href="#trunktestsphpunittestsformattingSeemsUtf8php">trunk/tests/phpunit/tests/formatting/SeemsUtf8.php</a></li>

<li><a href="#trunktestsphpunittestsformattingSmiliesphp">trunk/tests/phpunit/tests/formatting/Smilies.php</a></li>

<li><a href="#trunktestsphpunittestsformattingStripSlashesDeepphp">trunk/tests/phpunit/tests/formatting/StripSlashesDeep.php</a></li>

<li><a href="#trunktestsphpunittestsformattingURLShortenphp">trunk/tests/phpunit/tests/formatting/URLShorten.php</a></li>

<li><a href="#trunktestsphpunittestsformattingUtf8UriEncodephp">trunk/tests/phpunit/tests/formatting/Utf8UriEncode.php</a></li>

<li><a href="#trunktestsphpunittestsformattingWPSpecialcharsphp">trunk/tests/phpunit/tests/formatting/WPSpecialchars.php</a></li>

<li><a href="#trunktestsphpunittestsformattingWPStripAllTagsphp">trunk/tests/phpunit/tests/formatting/WPStripAllTags.php</a></li>

<li><a href="#trunktestsphpunittestsformattingWPTargetedLinkRelphp">trunk/tests/phpunit/tests/formatting/WPTargetedLinkRel.php</a></li>

<li><a href="#trunktestsphpunittestsformattingWPTexturizephp">trunk/tests/phpunit/tests/formatting/WPTexturize.php</a></li>

<li><a href="#trunktestsphpunittestsformattingWPTrimWordsphp">trunk/tests/phpunit/tests/formatting/WPTrimWords.php</a></li>

<li><a href="#trunktestsphpunittestsformattingbalanceTagsphp">trunk/tests/phpunit/tests/formatting/balanceTags.php</a></li>

<li><a href="#trunktestsphpunittestsformattingent2ncrphp">trunk/tests/phpunit/tests/formatting/ent2ncr.php</a></li>

<li><a href="#trunktestsphpunittestsfunctionsallowedProtocolsphp">trunk/tests/phpunit/tests/functions/allowedProtocols.php</a></li>

<li><a href="#trunktestsphpunittestsfunctionsdeprecatedphp">trunk/tests/phpunit/tests/functions/deprecated.php</a></li>

<li><a href="#trunktestsphpunittestsfunctionswpAuthCheckphp">trunk/tests/phpunit/tests/functions/wpAuthCheck.php</a></li>

<li><a href="#trunktestsphpunittestsfunctionsphp">trunk/tests/phpunit/tests/functions.php</a></li>

<li><a href="#trunktestsphpunittestsgeneralpaginateLinksphp">trunk/tests/phpunit/tests/general/paginateLinks.php</a></li>

<li><a href="#trunktestsphpunittestsgeneraltemplatephp">trunk/tests/phpunit/tests/general/template.php</a></li>

<li><a href="#trunktestsphpunittestshttpbasephp">trunk/tests/phpunit/tests/http/base.php</a></li>

<li><a href="#trunktestsphpunittestshttpfunctionsphp">trunk/tests/phpunit/tests/http/functions.php</a></li>

<li><a href="#trunktestsphpunittestshttphttpphp">trunk/tests/phpunit/tests/http/http.php</a></li>

<li><a href="#trunktestsphpunittestsimagedimensionsphp">trunk/tests/phpunit/tests/image/dimensions.php</a></li>

<li><a href="#trunktestsphpunittestsimageeditorphp">trunk/tests/phpunit/tests/image/editor.php</a></li>

<li><a href="#trunktestsphpunittestsimageeditorGdphp">trunk/tests/phpunit/tests/image/editorGd.php</a></li>

<li><a href="#trunktestsphpunittestsimageeditorImagickphp">trunk/tests/phpunit/tests/image/editorImagick.php</a></li>

<li><a href="#trunktestsphpunittestsimagefunctionsphp">trunk/tests/phpunit/tests/image/functions.php</a></li>

<li><a href="#trunktestsphpunittestsimageheaderphp">trunk/tests/phpunit/tests/image/header.php</a></li>

<li><a href="#trunktestsphpunittestsimageintermediateSizephp">trunk/tests/phpunit/tests/image/intermediateSize.php</a></li>

<li><a href="#trunktestsphpunittestsimagemetaphp">trunk/tests/phpunit/tests/image/meta.php</a></li>

<li><a href="#trunktestsphpunittestsimageresizephp">trunk/tests/phpunit/tests/image/resize.php</a></li>

<li><a href="#trunktestsphpunittestsimagesiteIconphp">trunk/tests/phpunit/tests/image/siteIcon.php</a></li>

<li><a href="#trunktestsphpunittestsimagesizephp">trunk/tests/phpunit/tests/image/size.php</a></li>

<li><a href="#trunktestsphpunittestsimportbasephp">trunk/tests/phpunit/tests/import/base.php</a></li>

<li><a href="#trunktestsphpunittestsimportimportphp">trunk/tests/phpunit/tests/import/import.php</a></li>

<li><a href="#trunktestsphpunittestsimportparserphp">trunk/tests/phpunit/tests/import/parser.php</a></li>

<li><a href="#trunktestsphpunittestsimportpostmetaphp">trunk/tests/phpunit/tests/import/postmeta.php</a></li>

<li><a href="#trunktestsphpunittestsincludeshelpersphp">trunk/tests/phpunit/tests/includes/helpers.php</a></li>

<li><a href="#trunktestsphpunittestsksesphp">trunk/tests/phpunit/tests/kses.php</a></li>

<li><a href="#trunktestsphpunittestslinkgetAdjacentPostphp">trunk/tests/phpunit/tests/link/getAdjacentPost.php</a></li>

<li><a href="#trunktestsphpunittestslinkgetAdjacentPostLinkphp">trunk/tests/phpunit/tests/link/getAdjacentPostLink.php</a></li>

<li><a href="#trunktestsphpunittestslinkphp">trunk/tests/phpunit/tests/link.php</a></li>

<li><a href="#trunktestsphpunittestsmailphp">trunk/tests/phpunit/tests/mail.php</a></li>

<li><a href="#trunktestsphpunittestsmediaphp">trunk/tests/phpunit/tests/media.php</a></li>

<li><a href="#trunktestsphpunittestsmetaqueryphp">trunk/tests/phpunit/tests/meta/query.php</a></li>

<li><a href="#trunktestsphpunittestsmetaslashesphp">trunk/tests/phpunit/tests/meta/slashes.php</a></li>

<li><a href="#trunktestsphpunittestsmetaphp">trunk/tests/phpunit/tests/meta.php</a></li>

<li><a href="#trunktestsphpunittestsmultisitesitephp">trunk/tests/phpunit/tests/multisite/site.php</a></li>

<li><a href="#trunktestsphpunittestsmultisitesiteDetailsphp">trunk/tests/phpunit/tests/multisite/siteDetails.php</a></li>

<li><a href="#trunktestsphpunittestsmultisitesiteQueryphp">trunk/tests/phpunit/tests/multisite/siteQuery.php</a></li>

<li><a href="#trunktestsphpunittestsmultisitephp">trunk/tests/phpunit/tests/multisite.php</a></li>

<li><a href="#trunktestsphpunittestsoembedpostEmbedUrlphp">trunk/tests/phpunit/tests/oembed/postEmbedUrl.php</a></li>

<li><a href="#trunktestsphpunittestsoptionmultisitephp">trunk/tests/phpunit/tests/option/multisite.php</a></li>

<li><a href="#trunktestsphpunittestsoptionoptionphp">trunk/tests/phpunit/tests/option/option.php</a></li>

<li><a href="#trunktestsphpunittestsoptionsiteOptionphp">trunk/tests/phpunit/tests/option/siteOption.php</a></li>

<li><a href="#trunktestsphpunittestsoptionslashesphp">trunk/tests/phpunit/tests/option/slashes.php</a></li>

<li><a href="#trunktestsphpunittestsoptiontransientphp">trunk/tests/phpunit/tests/option/transient.php</a></li>

<li><a href="#trunktestsphpunittestsoptionuserSettingsphp">trunk/tests/phpunit/tests/option/userSettings.php</a></li>

<li><a href="#trunktestsphpunittestspluggablephp">trunk/tests/phpunit/tests/pluggable.php</a></li>

<li><a href="#trunktestsphpunittestspomopluralFormsphp">trunk/tests/phpunit/tests/pomo/pluralForms.php</a></li>

<li><a href="#trunktestsphpunittestspomopophp">trunk/tests/phpunit/tests/pomo/po.php</a></li>

<li><a href="#trunktestsphpunittestspomotranslationEntryphp">trunk/tests/phpunit/tests/pomo/translationEntry.php</a></li>

<li><a href="#trunktestsphpunittestspomotranslationsphp">trunk/tests/phpunit/tests/pomo/translations.php</a></li>

<li><a href="#trunktestsphpunittestspostattachmentsphp">trunk/tests/phpunit/tests/post/attachments.php</a></li>

<li><a href="#trunktestsphpunittestspostfilteringphp">trunk/tests/phpunit/tests/post/filtering.php</a></li>

<li><a href="#trunktestsphpunittestspostformatsphp">trunk/tests/phpunit/tests/post/formats.php</a></li>

<li><a href="#trunktestsphpunittestspostgetPageUriphp">trunk/tests/phpunit/tests/post/getPageUri.php</a></li>

<li><a href="#trunktestsphpunittestspostgetPagesphp">trunk/tests/phpunit/tests/post/getPages.php</a></li>

<li><a href="#trunktestsphpunittestspostmetaphp">trunk/tests/phpunit/tests/post/meta.php</a></li>

<li><a href="#trunktestsphpunittestspostnavmenuphp">trunk/tests/phpunit/tests/post/nav-menu.php</a></li>

<li><a href="#trunktestsphpunittestspostobjectsphp">trunk/tests/phpunit/tests/post/objects.php</a></li>

<li><a href="#trunktestsphpunittestspostoutputphp">trunk/tests/phpunit/tests/post/output.php</a></li>

<li><a href="#trunktestsphpunittestspostqueryphp">trunk/tests/phpunit/tests/post/query.php</a></li>

<li><a href="#trunktestsphpunittestspostrevisionsphp">trunk/tests/phpunit/tests/post/revisions.php</a></li>

<li><a href="#trunktestsphpunittestspostslashesphp">trunk/tests/phpunit/tests/post/slashes.php</a></li>

<li><a href="#trunktestsphpunittestsposttemplatephp">trunk/tests/phpunit/tests/post/template.php</a></li>

<li><a href="#trunktestsphpunittestsposttypesphp">trunk/tests/phpunit/tests/post/types.php</a></li>

<li><a href="#trunktestsphpunittestspostwpUniquePostSlugphp">trunk/tests/phpunit/tests/post/wpUniquePostSlug.php</a></li>

<li><a href="#trunktestsphpunittestspostphp">trunk/tests/phpunit/tests/post.php</a></li>

<li><a href="#trunktestsphpunittestsquerycommentCountphp">trunk/tests/phpunit/tests/query/commentCount.php</a></li>

<li><a href="#trunktestsphpunittestsqueryconditionalsphp">trunk/tests/phpunit/tests/query/conditionals.php</a></li>

<li><a href="#trunktestsphpunittestsquerydatephp">trunk/tests/phpunit/tests/query/date.php</a></li>

<li><a href="#trunktestsphpunittestsquerydateQueryphp">trunk/tests/phpunit/tests/query/dateQuery.php</a></li>

<li><a href="#trunktestsphpunittestsqueryisTermphp">trunk/tests/phpunit/tests/query/isTerm.php</a></li>

<li><a href="#trunktestsphpunittestsquerymetaQueryphp">trunk/tests/phpunit/tests/query/metaQuery.php</a></li>

<li><a href="#trunktestsphpunittestsqueryresultsphp">trunk/tests/phpunit/tests/query/results.php</a></li>

<li><a href="#trunktestsphpunittestsquerysearchphp">trunk/tests/phpunit/tests/query/search.php</a></li>

<li><a href="#trunktestsphpunittestsquerytaxQueryphp">trunk/tests/phpunit/tests/query/taxQuery.php</a></li>

<li><a href="#trunktestsphpunittestsrestapirestattachmentscontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-attachments-controller.php</a></li>

<li><a href="#trunktestsphpunittestsrestapirestcategoriescontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-categories-controller.php</a></li>

<li><a href="#trunktestsphpunittestsrestapirestcommentscontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-comments-controller.php</a></li>

<li><a href="#trunktestsphpunittestsrestapirestpagescontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-pages-controller.php</a></li>

<li><a href="#trunktestsphpunittestsrestapirestpostmetafieldsphp">trunk/tests/phpunit/tests/rest-api/rest-post-meta-fields.php</a></li>

<li><a href="#trunktestsphpunittestsrestapirestpoststatusescontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-post-statuses-controller.php</a></li>

<li><a href="#trunktestsphpunittestsrestapirestposttypescontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-post-types-controller.php</a></li>

<li><a href="#trunktestsphpunittestsrestapirestpostscontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-posts-controller.php</a></li>

<li><a href="#trunktestsphpunittestsrestapirestrevisionscontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-revisions-controller.php</a></li>

<li><a href="#trunktestsphpunittestsrestapirestserverphp">trunk/tests/phpunit/tests/rest-api/rest-server.php</a></li>

<li><a href="#trunktestsphpunittestsrestapirestsettingscontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-settings-controller.php</a></li>

<li><a href="#trunktestsphpunittestsrestapiresttagscontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-tags-controller.php</a></li>

<li><a href="#trunktestsphpunittestsrestapiresttaxonomiescontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-taxonomies-controller.php</a></li>

<li><a href="#trunktestsphpunittestsrestapirestuserscontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-users-controller.php</a></li>

<li><a href="#trunktestsphpunittestsrestapiphp">trunk/tests/phpunit/tests/rest-api.php</a></li>

<li><a href="#trunktestsphpunittestsrewritenumericSlugsphp">trunk/tests/phpunit/tests/rewrite/numericSlugs.php</a></li>

<li><a href="#trunktestsphpunittestsrewritephp">trunk/tests/phpunit/tests/rewrite.php</a></li>

<li><a href="#trunktestsphpunittestsshortcodephp">trunk/tests/phpunit/tests/shortcode.php</a></li>

<li><a href="#trunktestsphpunitteststaxonomyphp">trunk/tests/phpunit/tests/taxonomy.php</a></li>

<li><a href="#trunktestsphpunitteststermcachephp">trunk/tests/phpunit/tests/term/cache.php</a></li>

<li><a href="#trunktestsphpunitteststermgetTermsphp">trunk/tests/phpunit/tests/term/getTerms.php</a></li>

<li><a href="#trunktestsphpunitteststermqueryphp">trunk/tests/phpunit/tests/term/query.php</a></li>

<li><a href="#trunktestsphpunitteststermslashesphp">trunk/tests/phpunit/tests/term/slashes.php</a></li>

<li><a href="#trunktestsphpunitteststermtaxQueryphp">trunk/tests/phpunit/tests/term/taxQuery.php</a></li>

<li><a href="#trunktestsphpunitteststermtermExistsphp">trunk/tests/phpunit/tests/term/termExists.php</a></li>

<li><a href="#trunktestsphpunitteststermwpGenerateTagCloudphp">trunk/tests/phpunit/tests/term/wpGenerateTagCloud.php</a></li>

<li><a href="#trunktestsphpunitteststermwpGetObjectTermsphp">trunk/tests/phpunit/tests/term/wpGetObjectTerms.php</a></li>

<li><a href="#trunktestsphpunitteststermwpInsertTermphp">trunk/tests/phpunit/tests/term/wpInsertTerm.php</a></li>

<li><a href="#trunktestsphpunitteststermwpSetObjectTermsphp">trunk/tests/phpunit/tests/term/wpSetObjectTerms.php</a></li>

<li><a href="#trunktestsphpunitteststermphp">trunk/tests/phpunit/tests/term.php</a></li>

<li><a href="#trunktestsphpunitteststhemeWPThemephp">trunk/tests/phpunit/tests/theme/WPTheme.php</a></li>

<li><a href="#trunktestsphpunitteststhemesupportphp">trunk/tests/phpunit/tests/theme/support.php</a></li>

<li><a href="#trunktestsphpunitteststhemethemeDirphp">trunk/tests/phpunit/tests/theme/themeDir.php</a></li>

<li><a href="#trunktestsphpunitteststhemephp">trunk/tests/phpunit/tests/theme.php</a></li>

<li><a href="#trunktestsphpunittestsuploadphp">trunk/tests/phpunit/tests/upload.php</a></li>

<li><a href="#trunktestsphpunittestsurlphp">trunk/tests/phpunit/tests/url.php</a></li>

<li><a href="#trunktestsphpunittestsuserauthorphp">trunk/tests/phpunit/tests/user/author.php</a></li>

<li><a href="#trunktestsphpunittestsusercapabilitiesphp">trunk/tests/phpunit/tests/user/capabilities.php</a></li>

<li><a href="#trunktestsphpunittestsusercountUsersphp">trunk/tests/phpunit/tests/user/countUsers.php</a></li>

<li><a href="#trunktestsphpunittestsusermultisitephp">trunk/tests/phpunit/tests/user/multisite.php</a></li>

<li><a href="#trunktestsphpunittestsuserqueryphp">trunk/tests/phpunit/tests/user/query.php</a></li>

<li><a href="#trunktestsphpunittestsuserslashesphp">trunk/tests/phpunit/tests/user/slashes.php</a></li>

<li><a href="#trunktestsphpunittestsuserwpDeleteUserphp">trunk/tests/phpunit/tests/user/wpDeleteUser.php</a></li>

<li><a href="#trunktestsphpunittestsuserwpDropdownUsersphp">trunk/tests/phpunit/tests/user/wpDropdownUsers.php</a></li>

<li><a href="#trunktestsphpunittestsuserwpGetUsersWithNoRolephp">trunk/tests/phpunit/tests/user/wpGetUsersWithNoRole.php</a></li>

<li><a href="#trunktestsphpunittestsuserphp">trunk/tests/phpunit/tests/user.php</a></li>

<li><a href="#trunktestsphpunittestswalkerphp">trunk/tests/phpunit/tests/walker.php</a></li>

<li><a href="#trunktestsphpunittestswidgetstextwidgetphp">trunk/tests/phpunit/tests/widgets/text-widget.php</a></li>

<li><a href="#trunktestsphpunittestswidgetsphp">trunk/tests/phpunit/tests/widgets.php</a></li>

<li><a href="#trunktestsphpunittestsxmlrpcbasicphp">trunk/tests/phpunit/tests/xmlrpc/basic.php</a></li>

<li><a href="#trunktestsphpunittestsxmlrpcmweditPostphp">trunk/tests/phpunit/tests/xmlrpc/mw/editPost.php</a></li>

<li><a href="#trunktestsphpunittestsxmlrpcmwgetPostphp">trunk/tests/phpunit/tests/xmlrpc/mw/getPost.php</a></li>

<li><a href="#trunktestsphpunittestsxmlrpcmwgetRecentPostsphp">trunk/tests/phpunit/tests/xmlrpc/mw/getRecentPosts.php</a></li>

<li><a href="#trunktestsphpunittestsxmlrpcmwnewPostphp">trunk/tests/phpunit/tests/xmlrpc/mw/newPost.php</a></li>

<li><a href="#trunktestsphpunittestsxmlrpcwpeditPostphp">trunk/tests/phpunit/tests/xmlrpc/wp/editPost.php</a></li>

<li><a href="#trunktestsphpunittestsxmlrpcwpeditProfilephp">trunk/tests/phpunit/tests/xmlrpc/wp/editProfile.php</a></li>

<li><a href="#trunktestsphpunittestsxmlrpcwpgetCommentphp">trunk/tests/phpunit/tests/xmlrpc/wp/getComment.php</a></li>

<li><a href="#trunktestsphpunittestsxmlrpcwpgetCommentsphp">trunk/tests/phpunit/tests/xmlrpc/wp/getComments.php</a></li>

<li><a href="#trunktestsphpunittestsxmlrpcwpgetMediaItemphp">trunk/tests/phpunit/tests/xmlrpc/wp/getMediaItem.php</a></li>

<li><a href="#trunktestsphpunittestsxmlrpcwpgetOptionsphp">trunk/tests/phpunit/tests/xmlrpc/wp/getOptions.php</a></li>

<li><a href="#trunktestsphpunittestsxmlrpcwpgetPagephp">trunk/tests/phpunit/tests/xmlrpc/wp/getPage.php</a></li>

<li><a href="#trunktestsphpunittestsxmlrpcwpgetPostphp">trunk/tests/phpunit/tests/xmlrpc/wp/getPost.php</a></li>

<li><a href="#trunktestsphpunittestsxmlrpcwpgetPostTypephp">trunk/tests/phpunit/tests/xmlrpc/wp/getPostType.php</a></li>

<li><a href="#trunktestsphpunittestsxmlrpcwpgetPostTypesphp">trunk/tests/phpunit/tests/xmlrpc/wp/getPostTypes.php</a></li>

<li><a href="#trunktestsphpunittestsxmlrpcwpgetPostsphp">trunk/tests/phpunit/tests/xmlrpc/wp/getPosts.php</a></li>

<li><a href="#trunktestsphpunittestsxmlrpcwpgetRevisionsphp">trunk/tests/phpunit/tests/xmlrpc/wp/getRevisions.php</a></li>

<li><a href="#trunktestsphpunittestsxmlrpcwpgetTermphp">trunk/tests/phpunit/tests/xmlrpc/wp/getTerm.php</a></li>

<li><a href="#trunktestsphpunittestsxmlrpcwpgetTermsphp">trunk/tests/phpunit/tests/xmlrpc/wp/getTerms.php</a></li>

<li><a href="#trunktestsphpunittestsxmlrpcwpgetUserphp">trunk/tests/phpunit/tests/xmlrpc/wp/getUser.php</a></li>

<li><a href="#trunktestsphpunittestsxmlrpcwpgetUsersphp">trunk/tests/phpunit/tests/xmlrpc/wp/getUsers.php</a></li>

<li><a href="#trunktestsphpunittestsxmlrpcwpnewCommentphp">trunk/tests/phpunit/tests/xmlrpc/wp/newComment.php</a></li>

<li><a href="#trunktestsphpunittestsxmlrpcwpnewPostphp">trunk/tests/phpunit/tests/xmlrpc/wp/newPost.php</a></li>

<li><a href="#trunktestsphpunittestsxmlrpcwprestoreRevisionphp">trunk/tests/phpunit/tests/xmlrpc/wp/restoreRevision.php</a></li>

<li><a href="#trunktestsphpunittestsxmlrpcwpsetOptionsphp">trunk/tests/phpunit/tests/xmlrpc/wp/setOptions.php</a></li>

<li><a href="#trunktestsphpunittestsxmlrpcwpuploadFilephp">trunk/tests/phpunit/tests/xmlrpc/wp/uploadFile.php</a></li>

<li><a href="#trunktestsphpunitwpmailrealtestphp">trunk/tests/phpunit/wp-mail-real-test.php</a></li>

<li><a href="#trunktestsqunitfixturescustomizemenusjs">trunk/tests/qunit/fixtures/customize-menus.js</a></li>

<li><a href="#trunktestsqunitfixturesupdatesjs">trunk/tests/qunit/fixtures/updates.js</a></li>

<li><a href="#trunktestsqunitfixtureswpapijs">trunk/tests/qunit/fixtures/wp-api.js</a></li>

<li><a href="#trunktestsqunitwpadminjscustomizebasejs">trunk/tests/qunit/wp-admin/js/customize-base.js</a></li>

<li><a href="#trunktestsqunitwpadminjscustomizecontrolsjs">trunk/tests/qunit/wp-admin/js/customize-controls.js</a></li>

<li><a href="#trunktestsqunitwpadminjscustomizenavmenusjs">trunk/tests/qunit/wp-admin/js/customize-nav-menus.js</a></li>

<li><a href="#trunktestsqunitwpadminjspasswordstrengthmeterjs">trunk/tests/qunit/wp-admin/js/password-strength-meter.js</a></li>

<li><a href="#trunktestsqunitwpadminjsupdatesjs">trunk/tests/qunit/wp-admin/js/updates.js</a></li>

<li><a href="#trunktestsqunitwpadminjswidgetstestmediaimagewidgetjs">trunk/tests/qunit/wp-admin/js/widgets/test-media-image-widget.js</a></li>

<li><a href="#trunktestsqunitwpincludesjsshortcodejs">trunk/tests/qunit/wp-includes/js/shortcode.js</a></li>

<li><a href="#trunktestsqunitwpincludesjstinymcepluginswptextpatternpluginjs">trunk/tests/qunit/wp-includes/js/tinymce/plugins/wptextpattern/plugin.js</a></li>

<li><a href="#trunkwptestsconfigsamplephp">trunk/wp-tests-config-sample.php</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkGruntfilejs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/Gruntfile.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/Gruntfile.js        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/Gruntfile.js  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,7 +43,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">        // Load tasks.

</span><span class="cx" style="display: block; padding: 0 10px">        require('matchdep').filterDev(['grunt-*', '!grunt-legacy-util']).forEach( grunt.loadNpmTasks );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Load legacy utils

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Load legacy utils.

</ins><span class="cx" style="display: block; padding: 0 10px">         grunt.util = require('grunt-legacy-util');

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">        // Project configuration.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -144,7 +144,7 @@

<span class="cx" style="display: block; padding: 0 10px">                                                        '!assets/**', // Assets is extracted into separate copy tasks.

<span class="cx" style="display: block; padding: 0 10px">                                                        '!js/**', // JavaScript is extracted into separate copy tasks.

</span><span class="cx" style="display: block; padding: 0 10px">                                                        '!.{svn,git}', // Exclude version control folders.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                        '!wp-includes/version.php', // Exclude version.php

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 '!wp-includes/version.php', // Exclude version.php.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                         '!**/*.map', // The build doesn't need .map files.

</span><span class="cx" style="display: block; padding: 0 10px">                                                        '!index.php', '!wp-admin/index.php',

</span><span class="cx" style="display: block; padding: 0 10px">                                                        '!_index.php', '!wp-admin/_index.php'

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -168,7 +168,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                                [ WORKING_DIR + 'wp-includes/js/clipboard.js' ]: [ './node_modules/clipboard/dist/clipboard.js' ],

</span><span class="cx" style="display: block; padding: 0 10px">                                                [ WORKING_DIR + 'wp-includes/js/hoverIntent.js' ]: [ './node_modules/jquery-hoverintent/jquery.hoverIntent.js' ],

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                // Renamed to avoid conflict with jQuery hoverIntent.min.js (after minifying)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         // Renamed to avoid conflict with jQuery hoverIntent.min.js (after minifying).

</ins><span class="cx" style="display: block; padding: 0 10px">                                                 [ WORKING_DIR + 'wp-includes/js/hoverintent-js.min.js' ]: [ './node_modules/hoverintent/dist/hoverintent.min.js' ],

</span><span class="cx" style="display: block; padding: 0 10px">                                                [ WORKING_DIR + 'wp-includes/js/imagesloaded.min.js' ]: [ './node_modules/imagesloaded/imagesloaded.pkgd.min.js' ],

</span><span class="cx" style="display: block; padding: 0 10px">                                                [ WORKING_DIR + 'wp-includes/js/jquery/jquery-migrate.js' ]: [ './node_modules/jquery-migrate/dist/jquery-migrate.js' ],

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -448,7 +448,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                },

</span><span class="cx" style="display: block; padding: 0 10px">                rtlcss: {

</span><span class="cx" style="display: block; padding: 0 10px">                        options: {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // rtlcss options

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // rtlcss options.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 opts: {

</span><span class="cx" style="display: block; padding: 0 10px">                                        clean: false,

</span><span class="cx" style="display: block; padding: 0 10px">                                        processUrls: { atrule: true, decl: false },

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -516,7 +516,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        '!wp-includes/css/*.min.css',

</span><span class="cx" style="display: block; padding: 0 10px">                                        '!wp-includes/css/dist',

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Exceptions

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Exceptions.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         '!wp-includes/css/dashicons.css',

</span><span class="cx" style="display: block; padding: 0 10px">                                        '!wp-includes/css/wp-embed-template.css',

</span><span class="cx" style="display: block; padding: 0 10px">                                        '!wp-includes/css/wp-embed-template-ie.css'

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -558,7 +558,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                src: [

</span><span class="cx" style="display: block; padding: 0 10px">                                        'twenty*/**/*.js',

</span><span class="cx" style="display: block; padding: 0 10px">                                        '!twenty{eleven,twelve,thirteen}/**',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Third party scripts

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Third party scripts.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         '!twenty{fourteen,fifteen,sixteen}/js/html5.js',

</span><span class="cx" style="display: block; padding: 0 10px">                                        '!twentyseventeen/assets/js/html5.js',

</span><span class="cx" style="display: block; padding: 0 10px">                                        '!twentyseventeen/assets/js/jquery.scrollTo.js',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -575,35 +575,36 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                cwd: SOURCE_DIR,

</span><span class="cx" style="display: block; padding: 0 10px">                                src: [

</span><span class="cx" style="display: block; padding: 0 10px">                                        'js/_enqueues/**/*.js',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Third party scripts

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Third party scripts.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         '!js/_enqueues/vendor/**/*.js'

</span><span class="cx" style="display: block; padding: 0 10px">                                ],

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Remove once other JSHint errors are resolved

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Remove once other JSHint errors are resolved.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 options: {

</span><span class="cx" style="display: block; padding: 0 10px">                                        curly: false,

</span><span class="cx" style="display: block; padding: 0 10px">                                        eqeqeq: 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">-                                // Limit JSHint's run to a single specified file:

-                               //

-                               //    grunt jshint:core --file=filename.js

-                               //

-                               // Optionally, include the file path:

-                               //

-                               //    grunt jshint:core --file=path/to/filename.js

-                               //

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         /*

+                                * Limit JSHint's run to a single specified file:

+                                *

+                                *    grunt jshint:core --file=filename.js

+                                *

+                                * Optionally, include the file path:

+                                *

+                                *    grunt jshint:core --file=path/to/filename.js

+                                */

</ins><span class="cx" style="display: block; padding: 0 10px">                                 filter: function( filepath ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        var index, file = grunt.option( 'file' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Don't filter when no target file is specified

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Don't filter when no target file is specified.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         if ( ! file ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                return true;

</span><span class="cx" style="display: block; padding: 0 10px">                                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Normalize filepath for Windows

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Normalize filepath for Windows.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         filepath = filepath.replace( /\\/g, '/' );

</span><span class="cx" style="display: block; padding: 0 10px">                                        index = filepath.lastIndexOf( '/' + file );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Match only the filename passed from cli

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Match only the filename passed from cli.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         if ( filepath === file || ( -1 !== index && index === filepath.length - ( file.length + 1 ) ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                return true;

</span><span class="cx" style="display: block; padding: 0 10px">                                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -618,14 +619,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        '**/*.js',

</span><span class="cx" style="display: block; padding: 0 10px">                                        '!**/*.min.js'

</span><span class="cx" style="display: block; padding: 0 10px">                                ],

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Limit JSHint's run to a single specified plugin directory:

-                               //

-                               //    grunt jshint:plugins --dir=foldername

-                               //

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         /*

+                                * Limit JSHint's run to a single specified plugin directory:

+                                *

+                                *    grunt jshint:plugins --dir=foldername

+                                */

</ins><span class="cx" style="display: block; padding: 0 10px">                                 filter: function( dirpath ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        var index, dir = grunt.option( 'dir' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Don't filter when no target folder is specified

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Don't filter when no target folder is specified.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         if ( ! dir ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                return true;

</span><span class="cx" style="display: block; padding: 0 10px">                                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -633,7 +635,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        dirpath = dirpath.replace( /\\/g, '/' );

</span><span class="cx" style="display: block; padding: 0 10px">                                        index = dirpath.lastIndexOf( '/' + dir );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Match only the folder name passed from cli

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Match only the folder name passed from cli.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         if ( -1 !== index ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                return true;

</span><span class="cx" style="display: block; padding: 0 10px">                                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -703,12 +705,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        'wp-includes/js/tinymce/plugins/wordpress/plugin.js',

</span><span class="cx" style="display: block; padding: 0 10px">                                        'wp-includes/js/tinymce/plugins/wp*/plugin.js',

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Exceptions

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Exceptions.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         '!**/*.min.js',

<span class="cx" style="display: block; padding: 0 10px">                                        '!wp-admin/js/custom-header.js', // Why? We should minify this.

</span><span class="cx" style="display: block; padding: 0 10px">                                        '!wp-admin/js/farbtastic.js',

</span><span class="cx" style="display: block; padding: 0 10px">                                        '!wp-includes/js/swfobject.js',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        '!wp-includes/js/wp-embed.js' // We have extra options for this, see uglify:embed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 '!wp-includes/js/wp-embed.js' // We have extra options for this, see uglify:embed.

</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">                        embed: {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1030,7 +1032,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                                                grunt.log.writeln( 'Fetching list of Twemoji files...' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                                // Fetch a list of the files that Twemoji supplies

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                         // Fetch a list of the files that Twemoji supplies.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                                 files = spawn( 'svn', [ 'ls', 'https://github.com/twitter/twemoji.git/trunk/assets/svg' ] );

</span><span class="cx" style="display: block; padding: 0 10px">                                                                if ( 0 !== files.status ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                                        grunt.fatal( 'Unable to fetch Twemoji file list' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1038,33 +1040,33 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                                                entities = files.stdout.toString();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                                // Tidy up the file list

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                         // Tidy up the file list.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                                 entities = entities.replace( /\.svg/g, '' );

</span><span class="cx" style="display: block; padding: 0 10px">                                                                entities = entities.replace( /^$/g, '' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                                // Convert the emoji entities to HTML entities

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                         // Convert the emoji entities to HTML entities.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                                 partials = entities = entities.replace( /([a-z0-9]+)/g, '&#x$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">-                                                                // Remove the hyphens between the HTML entities

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                         // Remove the hyphens between the HTML entities.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                                 entities = entities.replace( /-/g, '' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                                // Sort the entities list by length, so the longest emoji will be found first

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                         // Sort the entities list by length, so the longest emoji will be found first.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                                 emojiArray = entities.split( '\n' ).sort( function ( a, b ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                                        return b.length - a.length;

</span><span class="cx" style="display: block; padding: 0 10px">                                                                } );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                                // Convert the entities list to PHP array syntax

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                         // Convert the entities list to PHP array syntax.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                                 entities = '\'' + emojiArray.filter( function( val ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                                        return val.length >= 8 ? val : false ;

</span><span class="cx" style="display: block; padding: 0 10px">                                                                } ).join( '\', \'' ) + '\'';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                                // Create a list of all characters used by the emoji list

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                         // Create a list of all characters used by the emoji list.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                                 partials = partials.replace( /-/g, '\n' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                                // Set automatically removes duplicates

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                         // Set automatically removes duplicates.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                                 partialsSet = new Set( partials.split( '\n' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                                // Convert the partials list to PHP array syntax

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                         // Convert the partials list to PHP array syntax.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                                 partials = '\'' + Array.from( partialsSet ).filter( function( val ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                                        return val.length >= 8 ? val : false ;

</span><span class="cx" style="display: block; padding: 0 10px">                                                                } ).join( '\', \'' ) + '\'';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1158,7 +1160,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">-        // Allow builds to be minimal

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Allow builds to be minimal.

</ins><span class="cx" style="display: block; padding: 0 10px">         if( grunt.option( 'minimal-copy' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                var copyFilesOptions = grunt.config.get( 'copy.files.files' );

</span><span class="cx" style="display: block; padding: 0 10px">                copyFilesOptions[0].src.push( '!wp-content/plugins/**' );

</span></span></pre></div>

<a id="trunkphpcompatxmldist"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/phpcompat.xml.dist</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/phpcompat.xml.dist  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/phpcompat.xml.dist    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,7 +4,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        <rule ref="PHPCompatibilityWP"/>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        <!-- WordPress Core currently supports PHP 5.6+ -->

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <!-- WordPress Core currently supports PHP 5.6+. -->

</ins><span class="cx" style="display: block; padding: 0 10px">         <config name="testVersion" value="5.6-"/>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        <!-- Only scan PHP files. -->

</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">        <!-- Check up to 20 files simultaneously. -->

</span><span class="cx" style="display: block; padding: 0 10px">        <arg name="parallel" value="20"/>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        <!-- Show sniff codes in all reports -->

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <!-- Show sniff codes in all reports. -->

</ins><span class="cx" style="display: block; padding: 0 10px">         <arg value="ps"/>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        <!-- For now, only the files in src are scanned. -->

</span></span></pre></div>

<a id="trunkphpcsxmldist"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/phpcs.xml.dist</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/phpcs.xml.dist      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/phpcs.xml.dist        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,7 +20,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        <!-- Check up to 20 files simultaneously. -->

</span><span class="cx" style="display: block; padding: 0 10px">        <arg name="parallel" value="20"/>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        <!-- Show sniff codes in all reports -->

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <!-- Show sniff codes in all reports. -->

</ins><span class="cx" style="display: block; padding: 0 10px">         <arg value="ps"/>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        <file>.</file>

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,7 +48,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        <rule ref="WordPress.NamingConventions.ValidVariableName">

</span><span class="cx" style="display: block; padding: 0 10px">                <properties>

</span><span class="cx" style="display: block; padding: 0 10px">                        <property name="customPropertiesWhitelist" type="array">

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <!-- From database structure queries -->

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <!-- From database structure queries. -->

</ins><span class="cx" style="display: block; padding: 0 10px">                                 <element value="Collation"/>

</span><span class="cx" style="display: block; padding: 0 10px">                                <element value="Column_name"/>

</span><span class="cx" style="display: block; padding: 0 10px">                                <element value="Default"/>

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,14 +62,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                <element value="Null"/>

</span><span class="cx" style="display: block; padding: 0 10px">                                <element value="Sub_part"/>

</span><span class="cx" style="display: block; padding: 0 10px">                                <element value="Type"/>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <!-- From plugin/theme data -->

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <!-- From plugin/theme data. -->

</ins><span class="cx" style="display: block; padding: 0 10px">                                 <element value="authorAndUri"/>

</span><span class="cx" style="display: block; padding: 0 10px">                                <element value="Name"/>

</span><span class="cx" style="display: block; padding: 0 10px">                                <element value="Version"/>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <!-- From the result of wp_xmlrpc_server::wp_getPageList() -->

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <!-- From the result of wp_xmlrpc_server::wp_getPageList(). -->

</ins><span class="cx" style="display: block; padding: 0 10px">                                 <element value="dateCreated"/>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <!-- From DOMDocument -->

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <!-- From DOMDocument. -->

</ins><span class="cx" style="display: block; padding: 0 10px">                                 <element value="childNodes"/>

</span><span class="cx" style="display: block; padding: 0 10px">                                <element value="formatOutput"/>

</span><span class="cx" style="display: block; padding: 0 10px">                                <element value="nodeName"/>

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,7 +77,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                <element value="parentNode"/>

</span><span class="cx" style="display: block; padding: 0 10px">                                <element value="preserveWhiteSpace"/>

</span><span class="cx" style="display: block; padding: 0 10px">                                <element value="textContent"/>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <!-- From PHPMailer -->

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <!-- From PHPMailer. -->

</ins><span class="cx" style="display: block; padding: 0 10px">                                 <element value="AltBody"/>

</span><span class="cx" style="display: block; padding: 0 10px">                                <element value="Body"/>

</span><span class="cx" style="display: block; padding: 0 10px">                                <element value="CharSet"/>

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -89,11 +89,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                <element value="MIMEHeader"/>

</span><span class="cx" style="display: block; padding: 0 10px">                                <element value="Sender"/>

</span><span class="cx" style="display: block; padding: 0 10px">                                <element value="Subject"/>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <!-- From PHPUnit_Util_Getopt -->

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <!-- From PHPUnit_Util_Getopt. -->

</ins><span class="cx" style="display: block; padding: 0 10px">                                 <element value="longOptions"/>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <!-- From POP3 -->

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <!-- From POP3. -->

</ins><span class="cx" style="display: block; padding: 0 10px">                                 <element value="ERROR"/>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <!-- From ZipArchive -->

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <!-- From ZipArchive. -->

</ins><span class="cx" style="display: block; padding: 0 10px">                                 <element value="numFiles"/>

</span><span class="cx" style="display: block; padding: 0 10px">                        </property>

</span><span class="cx" style="display: block; padding: 0 10px">                </properties>

</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">        <!-- Exclude the build folder in the current directory, as Travis puts the checkout in a build directory. -->

</span><span class="cx" style="display: block; padding: 0 10px">        <exclude-pattern type="relative">^build/*</exclude-pattern>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        <!-- Directories and third party library exclusions -->

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <!-- Directories and third party library exclusions. -->

</ins><span class="cx" style="display: block; padding: 0 10px">         <exclude-pattern>/node_modules/*</exclude-pattern>

</span><span class="cx" style="display: block; padding: 0 10px">        <exclude-pattern>/vendor/*</exclude-pattern>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -140,7 +140,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        <exclude-pattern>/tests/phpunit/includes/speed-trap-listener\.php</exclude-pattern>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        <!-- Test data and fixtures -->

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <!-- Test data and fixtures. -->

</ins><span class="cx" style="display: block; padding: 0 10px">         <exclude-pattern>/tests/phpunit/build*</exclude-pattern>

</span><span class="cx" style="display: block; padding: 0 10px">        <exclude-pattern>/tests/phpunit/data/*</exclude-pattern>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -214,7 +214,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        <rule ref="WordPress.Files.FileName">

</span><span class="cx" style="display: block; padding: 0 10px">                <properties>

</span><span class="cx" style="display: block; padding: 0 10px">                        <property name="custom_test_class_whitelist" type="array">

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <!-- Test case parent classes -->

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <!-- Test case parent classes. -->

</ins><span class="cx" style="display: block; padding: 0 10px">                                 <element value="WP_UnitTestCase"/>

</span><span class="cx" style="display: block; padding: 0 10px">                                <element value="WP_Ajax_UnitTestCase"/>

</span><span class="cx" style="display: block; padding: 0 10px">                                <element value="WP_Canonical_UnitTestCase"/>

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -229,7 +229,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                <element value="WP_Import_UnitTestCase"/>

</span><span class="cx" style="display: block; padding: 0 10px">                                <element value="Tests_Query_Conditionals"/>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <!-- Mock classes -->

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <!-- Mock classes. -->

</ins><span class="cx" style="display: block; padding: 0 10px">                                 <element value="Spy_REST_Server"/>

</span><span class="cx" style="display: block; padding: 0 10px">                                <element value="WP_REST_Test_Controller"/>

</span><span class="cx" style="display: block; padding: 0 10px">                                <element value="WP_Image_Editor_Mock"/>

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -238,7 +238,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                <element value="MockAction"/>

</span><span class="cx" style="display: block; padding: 0 10px">                                <element value="WP_Object_Cache"/>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <!-- PHPUnit helpers -->

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <!-- PHPUnit helpers. -->

</ins><span class="cx" style="display: block; padding: 0 10px">                                 <element value="TracTickets"/>

</span><span class="cx" style="display: block; padding: 0 10px">                                <element value="WP_PHPUnit_Util_Getopt"/>

</span><span class="cx" style="display: block; padding: 0 10px">                                <element value="PHPUnit_Util_Test"/>

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -270,7 +270,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                </properties>

</span><span class="cx" style="display: block; padding: 0 10px">        </rule>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        <!-- Assignments in while conditions are a valid method of looping over iterables -->

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <!-- Assignments in while conditions are a valid method of looping over iterables. -->

</ins><span class="cx" style="display: block; padding: 0 10px">         <rule ref="WordPress.CodeAnalysis.AssignmentInCondition.FoundInWhileCondition">

</span><span class="cx" style="display: block; padding: 0 10px">                <exclude-pattern>*</exclude-pattern>

</span><span class="cx" style="display: block; padding: 0 10px">        </rule>

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -283,7 +283,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                <exclude-pattern>/tests/phpunit/tests/*</exclude-pattern>

</span><span class="cx" style="display: block; padding: 0 10px">        </rule>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        <!-- Exclude some old classes that can't be renamed, as it would break back compat -->

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <!-- Exclude some old classes that can't be renamed, as it would break back compat. -->

</ins><span class="cx" style="display: block; padding: 0 10px">         <rule ref="PEAR.NamingConventions.ValidClassName.Invalid">

</span><span class="cx" style="display: block; padding: 0 10px">                <exclude-pattern>/src/wp-admin/includes/class-wp-filesystem-ftpsockets\.php</exclude-pattern>

</span><span class="cx" style="display: block; padding: 0 10px">                <exclude-pattern>/src/wp-includes/class-wp-oembed\.php</exclude-pattern>

</span></span></pre></div>

<a id="trunkphpunitxmldist"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/phpunit.xml.dist</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/phpunit.xml.dist    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/phpunit.xml.dist      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,12 +5,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                beStrictAboutTestsThatDoNotTestAnything="true"

</span><span class="cx" style="display: block; padding: 0 10px">                >

</span><span class="cx" style="display: block; padding: 0 10px">        <testsuites>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <!-- Default test suite to run all tests -->

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <!-- Default test suite to run all tests. -->

</ins><span class="cx" style="display: block; padding: 0 10px">                 <testsuite name="default">

</span><span class="cx" style="display: block; padding: 0 10px">                        <directory suffix=".php">tests/phpunit/tests</directory>

</span><span class="cx" style="display: block; padding: 0 10px">                        <exclude>tests/phpunit/tests/rest-api/rest-autosaves-controller.php</exclude>

</span><span class="cx" style="display: block; padding: 0 10px">                </testsuite>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <!-- Sets the DOING_AUTOSAVE constant, so needs to be run last -->

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <!-- Sets the DOING_AUTOSAVE constant, so needs to be run last. -->

</ins><span class="cx" style="display: block; padding: 0 10px">                 <testsuite name="restapi-autosave">

</span><span class="cx" style="display: block; padding: 0 10px">                        <file>tests/phpunit/tests/rest-api/rest-autosaves-controller.php</file>

</span><span class="cx" style="display: block; padding: 0 10px">                </testsuite>

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,7 +44,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                <whitelist addUncoveredFilesFromWhitelist="true">

</span><span class="cx" style="display: block; padding: 0 10px">                        <directory suffix=".php">src</directory>

</span><span class="cx" style="display: block; padding: 0 10px">                        <exclude>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <!-- Third party library exclusions -->

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <!-- Third party library exclusions. -->

</ins><span class="cx" style="display: block; padding: 0 10px">                                 <directory suffix=".php">src/wp-includes/ID3</directory>

</span><span class="cx" style="display: block; padding: 0 10px">                                <directory suffix=".php">src/wp-includes/IXR</directory>

</span><span class="cx" style="display: block; padding: 0 10px">                                <directory suffix=".php">src/wp-includes/random_compat</directory>

</span></span></pre></div>

<a id="trunksrcindexphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/index.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/index.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/index.php 2020-01-29 00:43:23 UTC (rev 47122)

</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"> wp_check_php_mysql_versions();

</span><span class="cx" style="display: block; padding: 0 10px"> wp_load_translations_early();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Die with an error message

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Die with an error message.

</ins><span class="cx" style="display: block; padding: 0 10px"> $die = sprintf(

</span><span class="cx" style="display: block; padding: 0 10px">        '<p>%s</p>',

</span><span class="cx" style="display: block; padding: 0 10px">        __( 'You are running WordPress without JavaScript and CSS files. These need to be built.' )

</span></span></pre></div>

<a id="trunksrcjs_enqueuesadmincommentjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/admin/comment.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/admin/comment.js   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/admin/comment.js     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -70,7 +70,7 @@

<span class="cx" style="display: block; padding: 0 10px">         * @param {Event} event The event object.

</span><span class="cx" style="display: block; padding: 0 10px">         * @return {void}

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $timestampdiv.find('.save-timestamp').click( function( event ) { // crazyhorse - multiple ok cancels

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $timestampdiv.find('.save-timestamp').click( function( event ) { // Crazyhorse - multiple OK cancels.

</ins><span class="cx" style="display: block; padding: 0 10px">                 var aa = $('#aa').val(), mm = $('#mm').val(), jj = $('#jj').val(), hh = $('#hh').val(), mn = $('#mn').val(),

</span><span class="cx" style="display: block; padding: 0 10px">                        newD = new Date( aa, mm - 1, jj, hh, mn );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunksrcjs_enqueuesadmincommonjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/admin/common.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/admin/common.js    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/admin/common.js      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -168,7 +168,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                .length;

</span><span class="cx" style="display: block; padding: 0 10px"> };

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// stub for doing better warnings

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Stub for doing better warnings.

</ins><span class="cx" style="display: block; padding: 0 10px"> /**

<span class="cx" style="display: block; padding: 0 10px">  * Shows message pop-up notice or confirmation message.

</span><span class="cx" style="display: block; padding: 0 10px">  *

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -334,13 +334,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">        if ( link.is('.active a') )

</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">-        // Links

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Links.

</ins><span class="cx" style="display: block; padding: 0 10px">         $('.contextual-help-tabs .active').removeClass('active');

</span><span class="cx" style="display: block; padding: 0 10px">        link.parent('li').addClass('active');

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        panel = $( link.attr('href') );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Panels

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Panels.

</ins><span class="cx" style="display: block; padding: 0 10px">         $('.help-tab-content').not( panel ).removeClass('active').hide();

</span><span class="cx" style="display: block; padding: 0 10px">        panel.addClass('active').show();

</span><span class="cx" style="display: block; padding: 0 10px"> });

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -517,7 +517,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $( '#collapse-button' ).on( 'click.collapse-menu', function() {

</span><span class="cx" style="display: block; padding: 0 10px">                var viewportWidth = getViewportWidth() || 961;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // reset any compensation for submenus near the bottom of the screen

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Reset any compensation for submenus near the bottom of the screen.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $('#adminmenu div.wp-submenu').css('margin-top', '');

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( viewportWidth < 960 ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -582,12 +582,12 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                menutop = $menuItem.offset().top;

</span><span class="cx" style="display: block; padding: 0 10px">                wintop = $window.scrollTop();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                maxtop = menutop - wintop - 30; // max = make the top of the sub almost touch admin bar

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         maxtop = menutop - wintop - 30; // max = make the top of the sub almost touch admin bar.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                bottomOffset = menutop + $submenu.height() + 1; // Bottom offset of the menu

-               pageHeight = $wpwrap.height(); // Height of the entire page

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         bottomOffset = menutop + $submenu.height() + 1; // Bottom offset of the menu.

+               pageHeight = $wpwrap.height();                  // Height of the entire page.

</ins><span class="cx" style="display: block; padding: 0 10px">                 adjustment = 60 + bottomOffset - pageHeight;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                theFold = $window.height() + wintop - 50; // The fold

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         theFold = $window.height() + wintop - 50;       // The fold.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( theFold < ( bottomOffset - adjustment ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        adjustment = bottomOffset - theFold;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -604,8 +604,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        if ( 'ontouchstart' in window || /IEMobile\/[1-9]/.test(navigator.userAgent) ) { // touch screen device

-               // iOS Safari works with touchstart, the rest work with click

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'ontouchstart' in window || /IEMobile\/[1-9]/.test(navigator.userAgent) ) { // Touch screen device.

+               // iOS Safari works with touchstart, the rest work with click.

</ins><span class="cx" style="display: block; padding: 0 10px">                 mobileEvent = isIOS ? 'touchstart' : 'click';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -639,9 +639,11 @@

</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">-                        // Show the sub instead of following the link if:

-                       //      - the submenu is not open

-                       //      - the submenu is not shown inline or the menu is not folded

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 /*

+                        * Show the sub instead of following the link if:

+                        *      - the submenu is not open.

+                        *      - the submenu is not shown inline or the menu is not folded.

+                        */

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( ! $menuItem.hasClass( 'opensub' ) && ( ! $menuItem.hasClass( 'wp-menu-open' ) || $menuItem.width() < 40 ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                event.preventDefault();

</span><span class="cx" style="display: block; padding: 0 10px">                                adjustSubmenu( $menuItem );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -664,12 +666,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        $submenu = $menuItem.find( '.wp-submenu' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                        top = parseInt( $submenu.css( 'top' ), 10 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                if ( isNaN( top ) || top > -5 ) { // the submenu is visible

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         if ( isNaN( top ) || top > -5 ) { // The submenu is visible.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         return;

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( $adminmenu.data( 'wp-responsive' ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // The menu is in responsive mode, bail

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // The menu is in responsive mode, bail.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         return;

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -685,7 +687,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                         */

</span><span class="cx" style="display: block; padding: 0 10px">                        out: function(){

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( $adminmenu.data( 'wp-responsive' ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // The menu is in responsive mode, bail

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // The menu is in responsive mode, bail.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         return;

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -705,7 +707,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                $adminmenu.on( 'focus.adminmenu', '.wp-submenu a', function( event ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( $adminmenu.data( 'wp-responsive' ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // The menu is in responsive mode, bail

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // The menu is in responsive mode, bail.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 return;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -759,7 +761,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                $button = $( '<button type="button" class="notice-dismiss"><span class="screen-reader-text"></span></button>' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                btnText = commonL10n.dismiss || '';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Ensure plain text

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Ensure plain text.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $button.find( '.screen-reader-text' ).text( btnText );

</span><span class="cx" style="display: block; padding: 0 10px">                        $button.on( 'click.wp-dismiss-notice', function( event ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                event.preventDefault();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -776,7 +778,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $document.on( 'wp-updates-notice-added wp-plugin-install-error wp-plugin-update-error wp-plugin-delete-error wp-theme-install-error wp-theme-delete-error', makeNoticesDismissible );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Init screen meta

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Init screen meta.

</ins><span class="cx" style="display: block; padding: 0 10px">         screenMeta.init();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -902,7 +904,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        }, '.has-row-actions' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Toggle list table rows on small screens

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Toggle list table rows on small screens.

</ins><span class="cx" style="display: block; padding: 0 10px">         $( 'tbody' ).on( 'click', '.toggle-row', function() {

</span><span class="cx" style="display: block; padding: 0 10px">                $( this ).closest( 'tr' ).toggleClass( 'is-expanded' );

</span><span class="cx" style="display: block; padding: 0 10px">        });

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -925,7 +927,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // After pressing escape key (keyCode: 27), the tab key should tab out of the textarea.

</span><span class="cx" style="display: block; padding: 0 10px">                if ( e.keyCode == 27 ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // when pressing Escape: Opera 12 and 27 blur form fields, IE 8 clears them

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // When pressing Escape: Opera 12 and 27 blur form fields, IE 8 clears them.

</ins><span class="cx" style="display: block; padding: 0 10px">                         e.preventDefault();

</span><span class="cx" style="display: block; padding: 0 10px">                        $(el).data('tab-out', true);

</span><span class="cx" style="display: block; padding: 0 10px">                        return;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1276,7 +1278,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        this.maybeDisableSortables = this.maybeDisableSortables.bind( this );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Modify functionality based on custom activate/deactivate event

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Modify functionality based on custom activate/deactivate event.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $document.on( 'wp-responsive-activate.wp-responsive', function() {

</span><span class="cx" style="display: block; padding: 0 10px">                                self.activate();

</span><span class="cx" style="display: block; padding: 0 10px">                        }).on( 'wp-responsive-deactivate.wp-responsive', function() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1289,7 +1291,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $( '#wp-admin-bar-menu-toggle' ).on( 'click.wp-responsive', function( event ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                event.preventDefault();

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // close any open toolbar submenus.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Close any open toolbar submenus.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $adminbar.find( '.hover' ).removeClass( 'hover' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                $wpwrap.toggleClass( 'wp-responsive-open' );

</span></span></pre></div>

<a id="trunksrcjs_enqueuesadmineditcommentsjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/admin/edit-comments.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/admin/edit-comments.js     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/admin/edit-comments.js       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -192,7 +192,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                var newTitle, regExMatch, titleCount, commentFrag;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                titleRegEx = titleRegEx || new RegExp( adminCommentsL10n.docTitleCommentsCount.replace( '%s', '\\([0-9' + thousandsSeparator + ']+\\)' ) + '?' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // count funcs operate on a $'d element

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Count funcs operate on a $'d element.

</ins><span class="cx" style="display: block; padding: 0 10px">                 titleDiv = titleDiv || $( '<div />' );

</span><span class="cx" style="display: block; padding: 0 10px">                newTitle = adminTitle;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -256,7 +256,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        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">-                // cache selectors to not get dupes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Cache selectors to not get dupes.

</ins><span class="cx" style="display: block; padding: 0 10px">                 pending = $( 'span.' + pendingClass, postSelector );

</span><span class="cx" style="display: block; padding: 0 10px">                noPending = $( 'span.' + noClass, postSelector );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -444,7 +444,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        a.click(function( e ){

</span><span class="cx" style="display: block; padding: 0 10px">                                e.preventDefault();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                e.stopPropagation(); // ticket #35904

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         e.stopPropagation(); // Ticket #35904.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 list.wpList.del(this);

</span><span class="cx" style="display: block; padding: 0 10px">                                $('#undo-' + id).css( {backgroundColor:'#ceb'} ).fadeOut(350, function(){

</span><span class="cx" style="display: block; padding: 0 10px">                                        $(this).remove();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -491,17 +491,19 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        unapproved = commentRow.hasClass( 'unapproved' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        spammed = commentRow.hasClass( 'spam' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        trashed = commentRow.hasClass( 'trash' ),

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        undoing = false; // ticket #35904

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 undoing = false; // Ticket #35904.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                updateDashboardText( newTotal );

</span><span class="cx" style="display: block; padding: 0 10px">                updateInModerationText( newTotal );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // the order of these checks is important

-               // .unspam can also have .approve or .unapprove

-               // .untrash can also have .approve or .unapprove

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /*

+                * The order of these checks is important.

+                * .unspam can also have .approve or .unapprove.

+                * .untrash can also have .approve or .unapprove.

+                */

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( targetParent.is( 'span.undo' ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // the comment was spammed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // The comment was spammed.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( targetParent.hasClass( 'unspam' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                spamDiff = -1;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -513,7 +515,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        pendingDiff = 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">-                        // the comment was trashed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // The comment was trashed.

</ins><span class="cx" style="display: block; padding: 0 10px">                         } else if ( targetParent.hasClass( 'untrash' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                trashDiff = -1;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -528,22 +530,22 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        undoing = 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">-                // user clicked "Spam"

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // User clicked "Spam".

</ins><span class="cx" style="display: block; padding: 0 10px">                 } else if ( targetParent.is( 'span.spam' ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // the comment is currently approved

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // The comment is currently approved.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( approved ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                approvedDiff = -1;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // the comment is currently pending

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // The comment is currently pending.

</ins><span class="cx" style="display: block; padding: 0 10px">                         } else if ( unapproved ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                pendingDiff = -1;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // the comment was in the trash

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // The comment was in the trash.

</ins><span class="cx" style="display: block; padding: 0 10px">                         } else if ( trashed ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                trashDiff = -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">-                        // you can't spam an item on the spam screen

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // You can't spam an item on the Spam screen.

</ins><span class="cx" style="display: block; padding: 0 10px">                         spamDiff = 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">-                // user clicked "Unspam"

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // User clicked "Unspam".

</ins><span class="cx" style="display: block; padding: 0 10px">                 } else if ( targetParent.is( 'span.unspam' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( approved ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                pendingDiff = 1;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -550,10 +552,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        } else if ( unapproved ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                approvedDiff = 1;

</span><span class="cx" style="display: block; padding: 0 10px">                        } else if ( trashed ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // the comment was previously approved

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // The comment was previously approved.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( targetParent.hasClass( 'approve' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        approvedDiff = 1;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // the comment was previously pending

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // The comment was previously pending.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 } else if ( targetParent.hasClass( 'unapprove' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        pendingDiff = 1;

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -565,23 +567,23 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        pendingDiff = 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">-                        // you can Unspam an item on the spam screen

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // You can unspam an item on the Spam screen.

</ins><span class="cx" style="display: block; padding: 0 10px">                         spamDiff = -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">-                // user clicked "Trash"

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // User clicked "Trash".

</ins><span class="cx" style="display: block; padding: 0 10px">                 } else if ( targetParent.is( 'span.trash' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( approved ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                approvedDiff = -1;

</span><span class="cx" style="display: block; padding: 0 10px">                        } else if ( unapproved ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                pendingDiff = -1;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // the comment was in the spam queue

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // The comment was in the spam queue.

</ins><span class="cx" style="display: block; padding: 0 10px">                         } else if ( spammed ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                spamDiff = -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">-                        // you can't trash an item on the trash screen

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // You can't trash an item on the Trash screen.

</ins><span class="cx" style="display: block; padding: 0 10px">                         trashDiff = 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">-                // user clicked "Restore"

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // User clicked "Restore".

</ins><span class="cx" style="display: block; padding: 0 10px">                 } else if ( targetParent.is( 'span.untrash' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( approved ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                pendingDiff = 1;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -594,21 +596,21 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        pendingDiff = 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">-                        // you can't go from trash to spam

-                       // you can untrash on the trash screen

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // You can't go from Trash to Spam.

+                       // You can untrash on the Trash screen.

</ins><span class="cx" style="display: block; padding: 0 10px">                         trashDiff = -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">-                // User clicked "Approve"

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // User clicked "Approve".

</ins><span class="cx" style="display: block; padding: 0 10px">                 } else if ( targetParent.is( 'span.approve:not(.unspam):not(.untrash)' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        approvedDiff = 1;

</span><span class="cx" style="display: block; padding: 0 10px">                        pendingDiff = -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">-                // User clicked "Unapprove"

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // User clicked "Unapprove".

</ins><span class="cx" style="display: block; padding: 0 10px">                 } else if ( targetParent.is( 'span.unapprove:not(.unspam):not(.untrash)' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        approvedDiff = -1;

</span><span class="cx" style="display: block; padding: 0 10px">                        pendingDiff = 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">-                // User clicked "Delete Permanently"

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // User clicked "Delete Permanently".

</ins><span class="cx" style="display: block; padding: 0 10px">                 } else if ( targetParent.is( 'span.delete' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( spammed ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                spamDiff = -1;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -713,10 +715,10 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if (ev) {

</span><span class="cx" style="display: block; padding: 0 10px">                        theExtraList.empty();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        args.number = Math.min(8, per_page); // see WP_Comments_List_Table::prepare_items() @ class-wp-comments-list-table.php

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 args.number = Math.min(8, per_page); // See WP_Comments_List_Table::prepare_items() in class-wp-comments-list-table.php.

</ins><span class="cx" style="display: block; padding: 0 10px">                 } else {

</span><span class="cx" style="display: block; padding: 0 10px">                        args.number = 1;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        args.offset = Math.min(8, per_page) - 1; // fetch only the next item on the extra list

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 args.offset = Math.min(8, per_page) - 1; // Fetch only the next item on the extra list.

</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">                args.no_placeholder = true;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -723,7 +725,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                args.paged ++;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // $.query.get() needs some correction to be sent into an ajax request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // $.query.get() needs some correction to be sent into an Ajax request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( true === args.comment_type )

</span><span class="cx" style="display: block; padding: 0 10px">                        args.comment_type = '';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -781,9 +783,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Initializes the comment reply functionality.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * @since 2.7.0

+        *

</ins><span class="cx" style="display: block; padding: 0 10px">          * @memberof commentReply

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         *

-        * @since 2.7.0

</del><span class="cx" style="display: block; padding: 0 10px">          */

</span><span class="cx" style="display: block; padding: 0 10px">        init : function() {

</span><span class="cx" style="display: block; padding: 0 10px">                var row = $('#replyrow');

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -798,7 +800,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">-                // add events

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Add events.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $('#the-comment-list .column-comment > p').dblclick(function(){

</span><span class="cx" style="display: block; padding: 0 10px">                        commentReply.toggle($(this).parent());

</span><span class="cx" style="display: block; padding: 0 10px">                });

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -911,7 +913,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                .focus();

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // reset the Quicktags buttons

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Reset the Quicktags buttons.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( typeof QTags != 'undefined' )

</span><span class="cx" style="display: block; padding: 0 10px">                        QTags.closeAllTags('replycontent');

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1029,7 +1031,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $('#replycontent').focus().keyup(function(e){

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( e.which == 27 )

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        commentReply.revert(); // close on Escape

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 commentReply.revert(); // Close on Escape.

</ins><span class="cx" style="display: block; padding: 0 10px">                         });

</span><span class="cx" style="display: block; padding: 0 10px">                }, 600);

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1130,7 +1132,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        updateCountText( 'span.all-count', 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">-                c = $.trim(r.data); // Trim leading whitespaces

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         c = $.trim(r.data); // Trim leading whitespaces.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $(c).hide();

</span><span class="cx" style="display: block; padding: 0 10px">                $('#replyrow').after(c);

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunksrcjs_enqueuesadmininlineeditpostjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/admin/inline-edit-post.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/admin/inline-edit-post.js  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/admin/inline-edit-post.js    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,13 +29,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Initializes the inline and bulk post editor.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Binds event handlers to the escape key to close the inline editor

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Binds event handlers to the Escape key to close the inline editor

</ins><span class="cx" style="display: block; padding: 0 10px">          * and to the save and close buttons. Changes DOM to be ready for inline

<span class="cx" style="display: block; padding: 0 10px">         * editing. Adds event handler to bulk edit.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @memberof inlineEditPost

</del><span class="cx" style="display: block; padding: 0 10px">          * @since 2.7.0

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * @memberof inlineEditPost

+        *

</ins><span class="cx" style="display: block; padding: 0 10px">          * @return {void}

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        init : function(){

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,16 +43,16 @@

</span><span class="cx" style="display: block; padding: 0 10px">                var t = this, qeRow = $('#inline-edit'), bulkRow = $('#bulk-edit');

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                t.type = $('table.widefat').hasClass('pages') ? 'page' : 'post';

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Post id prefix.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Post ID prefix.

</ins><span class="cx" style="display: block; padding: 0 10px">                 t.what = '#post-';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                /**

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 * Binds the escape key to revert the changes and close the quick editor.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+          * Binds the Escape key to revert the changes and close the quick editor.

</ins><span class="cx" style="display: block; padding: 0 10px">                  *

<span class="cx" style="display: block; padding: 0 10px">                 * @return {boolean} The result of revert.

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                qeRow.keyup(function(e){

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Revert changes if escape key is pressed.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Revert changes if Escape key is pressed.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( e.which === 27 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                return inlineEditPost.revert();

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -58,12 +59,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                });

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                /**

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 * Binds the escape key to revert the changes and close the bulk editor.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+          * Binds the Escape key to revert the changes and close the bulk editor.

</ins><span class="cx" style="display: block; padding: 0 10px">                  *

<span class="cx" style="display: block; padding: 0 10px">                 * @return {boolean} The result of revert.

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                bulkRow.keyup(function(e){

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Revert changes if escape key is pressed.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Revert changes if Escape key is pressed.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( e.which === 27 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                return inlineEditPost.revert();

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -88,7 +89,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">                /**

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 * If enter is pressed, and the target is not the cancel button, save the post.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+          * If Enter is pressed, and the target is not the cancel button, save the post.

</ins><span class="cx" style="display: block; padding: 0 10px">                  *

<span class="cx" style="display: block; padding: 0 10px">                 * @return {boolean} The result of save.

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -157,9 +158,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * Toggles the quick edit window, hiding it when it's active and showing it when

</span><span class="cx" style="display: block; padding: 0 10px">         * inactive.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @memberof inlineEditPost

</del><span class="cx" style="display: block; padding: 0 10px">          * @since 2.7.0

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * @memberof inlineEditPost

+        *

</ins><span class="cx" style="display: block; padding: 0 10px">          * @param {Object} el Element within a post table row.

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        toggle : function(el){

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -170,8 +172,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Creates the bulk editor row to edit multiple posts at once.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * @since 2.7.0

+        *

</ins><span class="cx" style="display: block; padding: 0 10px">          * @memberof inlineEditPost

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since 2.7.0

</del><span class="cx" style="display: block; padding: 0 10px">          */

</span><span class="cx" style="display: block; padding: 0 10px">        setBulk : function(){

</span><span class="cx" style="display: block; padding: 0 10px">                var te = '', type = this.type, c = true;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -242,9 +245,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Creates a quick edit window for the post that has been clicked.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @memberof inlineEditPost

</del><span class="cx" style="display: block; padding: 0 10px">          * @since 2.7.0

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * @memberof inlineEditPost

+        *

</ins><span class="cx" style="display: block; padding: 0 10px">          * @param {number|Object} id The id of the clicked post or an element within a post

<span class="cx" style="display: block; padding: 0 10px">         *                           table row.

<span class="cx" style="display: block; padding: 0 10px">         * @return {boolean} Always returns false at the end of execution.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -409,7 +413,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                fields = $('#edit-'+id).find(':input').serialize();

</span><span class="cx" style="display: block; padding: 0 10px">                params = fields + '&' + $.param(params);

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make ajax request.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make Ajax request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $.post( ajaxurl, params,

</span><span class="cx" style="display: block; padding: 0 10px">                        function(r) {

</span><span class="cx" style="display: block; padding: 0 10px">                                var $errorNotice = $( '#edit-' + id + ' .inline-edit-save .notice-error' ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -450,9 +454,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Hides and empties the Quick Edit and/or Bulk Edit windows.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @memberof    inlineEditPost

</del><span class="cx" style="display: block; padding: 0 10px">          * @since 2.7.0

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * @memberof inlineEditPost

+        *

</ins><span class="cx" style="display: block; padding: 0 10px">          * @return {boolean} Always returns false.

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        revert : function(){

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -494,9 +499,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * Gets the id for a the post that you want to quick edit from the row in the quick

<span class="cx" style="display: block; padding: 0 10px">         * edit table.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @memberof    inlineEditPost

</del><span class="cx" style="display: block; padding: 0 10px">          * @since 2.7.0

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * @memberof inlineEditPost

+        *

</ins><span class="cx" style="display: block; padding: 0 10px">          * @param  {Object} o DOM row object to get the id for.

<span class="cx" style="display: block; padding: 0 10px">         * @return {string}   The post id extracted from the table row in the object.

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -546,7 +552,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> }).ready( function() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Set the heartbeat interval to 15 sec.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Set the heartbeat interval to 15 seconds.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( typeof wp !== 'undefined' && wp.heartbeat ) {

</span><span class="cx" style="display: block; padding: 0 10px">                wp.heartbeat.interval( 15 );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span></span></pre></div>

<a id="trunksrcjs_enqueuesadmininlineedittaxjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/admin/inline-edit-tax.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/admin/inline-edit-tax.js   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/admin/inline-edit-tax.js     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,12 +43,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                });

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                /**

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 * Cancels inline editing when pressing escape inside the inline editor.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+          * Cancels inline editing when pressing Escape inside the inline editor.

</ins><span class="cx" style="display: block; padding: 0 10px">                  *

<span class="cx" style="display: block; padding: 0 10px">                 * @param {Object} e The keyup event that has been triggered.

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                row.keyup( function( e ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // 27 = [escape]

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // 27 = [Escape].

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( e.which === 27 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                return inlineEditTax.revert();

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -69,10 +69,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                });

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                /**

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 * Saves the inline edits when pressing enter inside the inline editor.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+          * Saves the inline edits when pressing Enter inside the inline editor.

</ins><span class="cx" style="display: block; padding: 0 10px">                  */

</span><span class="cx" style="display: block; padding: 0 10px">                $( 'input, select', row ).keydown( function( e ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // 13 = [enter]

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // 13 = [Enter].

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( e.which === 13 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                return inlineEditTax.save( this );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -184,7 +184,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                fields = $('#edit-'+id).find(':input').serialize();

</span><span class="cx" style="display: block; padding: 0 10px">                params = fields + '&' + $.param(params);

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Do the ajax request to save the data to the server.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Do the Ajax request to save the data to the server.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $.post( ajaxurl, params,

</span><span class="cx" style="display: block; padding: 0 10px">                        /**

</span><span class="cx" style="display: block; padding: 0 10px">                         * Handles the response from the server

</span></span></pre></div>

<a id="trunksrcjs_enqueuesadminlinkjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/admin/link.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/admin/link.js      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/admin/link.js        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,7 +9,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        var newCat, noSyncChecks = false, syncChecks, catAddAfter;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $('#link_name').focus();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // postboxes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Postboxes.

</ins><span class="cx" style="display: block; padding: 0 10px">         postboxes.add_postbox_toggles('link');

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,7 +33,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        if ( getUserSetting('cats') )

</span><span class="cx" style="display: block; padding: 0 10px">                $('#category-tabs a[href="#categories-pop"]').click();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Ajax Cat

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Ajax Cat.

</ins><span class="cx" style="display: block; padding: 0 10px">         newCat = $('#newcat').one( 'focus', function() { $(this).val( '' ).removeClass( 'form-input-tip' ); } );

</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="trunksrcjs_enqueuesadminmediauploadjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/admin/media-upload.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/admin/media-upload.js      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/admin/media-upload.js        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,8 +43,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                editor = tinymce.get( wpActiveEditor );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // If the editor is set and not hidden, insert the HTML into the content of the

-       // editor.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If the editor is set and not hidden,

+       // insert the HTML into the content of the editor.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( editor && ! editor.isHidden() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                editor.execCommand( 'mceInsertContent', false, html );

</span><span class="cx" style="display: block; padding: 0 10px">        } else if ( hasQuicktags ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,8 +51,8 @@

<span class="cx" style="display: block; padding: 0 10px">                // If quick tags are available, insert the HTML into its content.

</span><span class="cx" style="display: block; padding: 0 10px">                QTags.insertContent( html );

</span><span class="cx" style="display: block; padding: 0 10px">        } else {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If neither the TinyMCE editor and the quick tags are available, add the HTML

-               // to the current active editor.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If neither the TinyMCE editor and the quick tags are available,

+               // add the HTML to the current active editor.

</ins><span class="cx" style="display: block; padding: 0 10px">                 document.getElementById( wpActiveEditor ).value += html;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunksrcjs_enqueuesadminplugininstalljs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/admin/plugin-install.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/admin/plugin-install.js    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/admin/plugin-install.js      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -183,11 +183,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                var tab = $( this ).attr( 'name' );

</span><span class="cx" style="display: block; padding: 0 10px">                event.preventDefault();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Flip the tab

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Flip the tab.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $( '#plugin-information-tabs a.current' ).removeClass( 'current' );

</span><span class="cx" style="display: block; padding: 0 10px">                $( this ).addClass( 'current' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Only show the fyi box in the description section, on smaller screen, where it's otherwise always displayed at the top.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Only show the fyi box in the description section, on smaller screen,

+               // where it's otherwise always displayed at the top.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( 'description' !== tab && $( window ).width() < 772 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $( '#plugin-information-content' ).find( '.fyi' ).hide();

</span><span class="cx" style="display: block; padding: 0 10px">                } else {

</span></span></pre></div>

<a id="trunksrcjs_enqueuesadminpostjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/admin/post.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/admin/post.js      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/admin/post.js        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,9 +91,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                /**

<span class="cx" style="display: block; padding: 0 10px">                 * Load the next batch of comments.

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 * @memberof commentsBox

+                *

</ins><span class="cx" style="display: block; padding: 0 10px">                  * @param {int} total Total number of comments to load.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 *

-                * @memberof commentsBox

</del><span class="cx" style="display: block; padding: 0 10px">                  */

</span><span class="cx" style="display: block; padding: 0 10px">                load: function(total){

</span><span class="cx" style="display: block; padding: 0 10px">                        this.st = jQuery('#the-comment-list tr.comment:visible').length;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -309,17 +309,17 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">        // Post locks: contain focus inside the dialog. If the dialog is shown, focus the first item.

</span><span class="cx" style="display: block; padding: 0 10px">        $('#post-lock-dialog .notification-dialog').on( 'keydown', function(e) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Don't do anything when [tab] is pressed.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Don't do anything when [Tab] is pressed.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( e.which != 9 )

</span><span class="cx" style="display: block; padding: 0 10px">                        return;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                var target = $(e.target);

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // [shift] + [tab] on first tab cycles back to last tab.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // [Shift] + [Tab] on first tab cycles back to last tab.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( target.hasClass('wp-tab-first') && e.shiftKey ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $(this).find('.wp-tab-last').focus();

</span><span class="cx" style="display: block; padding: 0 10px">                        e.preventDefault();

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // [tab] on last tab cycles back to first tab.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // [Tab] on last tab cycles back to first tab.

</ins><span class="cx" style="display: block; padding: 0 10px">                 } else if ( target.hasClass('wp-tab-last') && ! e.shiftKey ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $(this).find('.wp-tab-first').focus();

</span><span class="cx" style="display: block; padding: 0 10px">                        e.preventDefault();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -326,7 +326,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        }).filter(':visible').find('.wp-tab-first').focus();

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Set the heartbeat interval to 15 sec. if post lock dialogs are enabled.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Set the heartbeat interval to 15 seconds if post lock dialogs are enabled.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( wp.heartbeat && $('#post-lock-dialog').length ) {

</span><span class="cx" style="display: block; padding: 0 10px">                wp.heartbeat.interval( 15 );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -385,7 +385,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">-        // Submit the form saving a draft or an autosave, and show a preview in a new tab

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Submit the form saving a draft or an autosave, and show a preview in a new tab.

</ins><span class="cx" style="display: block; padding: 0 10px">         $('#post-preview').on( 'click.post-preview', function( event ) {

</span><span class="cx" style="display: block; padding: 0 10px">                var $this = $(this),

</span><span class="cx" style="display: block; padding: 0 10px">                        $form = $('form#post'),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -534,7 +534,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                });

</span><span class="cx" style="display: block; padding: 0 10px">        });

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Multiple Taxonomies.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Multiple taxonomies.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( $('#tagsdiv-post_tag').length ) {

</span><span class="cx" style="display: block; padding: 0 10px">                window.tagBox && window.tagBox.init();

</span><span class="cx" style="display: block; padding: 0 10px">        } else {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -559,7 +559,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        settingName = 'cats';

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // TODO: move to jQuery 1.3+, support for multiple hierarchical taxonomies, see wp-lists.js

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // @todo Move to jQuery 1.3+, support for multiple hierarchical taxonomies, see wp-lists.js.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $('a', '#' + taxonomy + '-tabs').click( function( e ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        e.preventDefault();

</span><span class="cx" style="display: block; padding: 0 10px">                        var t = $(this).attr('href');

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -581,7 +581,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $( this ).val( '' ).removeClass( 'form-input-tip' );

</span><span class="cx" style="display: block; padding: 0 10px">                });

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // On [enter] submit the taxonomy.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // On [Enter] submit the taxonomy.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $('#new' + taxonomy).keypress( function(event){

</span><span class="cx" style="display: block; padding: 0 10px">                        if( 13 === event.keyCode ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                event.preventDefault();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -654,7 +654,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                $('#in-' + taxonomy + '-' + id + ', #in-popular-' + taxonomy + '-' + id).prop( 'checked', c );

</span><span class="cx" style="display: block; padding: 0 10px">                });

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        }); // end cats

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }); // End cats.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">        // Custom Fields postbox.

</span><span class="cx" style="display: block; padding: 0 10px">        if ( $('#postcustom').length ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -796,7 +796,8 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                        // Update "Status:" to currently selected status.

</span><span class="cx" style="display: block; padding: 0 10px">                        $('#post-status-display').text(

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                wp.sanitize.stripTagsAndEncodeText( $('option:selected', postStatus).text() ) // Remove any potential tags from post status text.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Remove any potential tags from post status text.

+                               wp.sanitize.stripTagsAndEncodeText( $('option:selected', postStatus).text() )

</ins><span class="cx" style="display: block; padding: 0 10px">                         );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                        // Show or hide the "Save Draft" button.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -838,7 +839,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                });

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Set the selected visibility as current.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $postVisibilitySelect.find('.save-post-visibility').click( function( event ) { // crazyhorse - multiple ok cancels

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $postVisibilitySelect.find('.save-post-visibility').click( function( event ) { // Crazyhorse - multiple OK cancels.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $postVisibilitySelect.slideUp('fast');

</span><span class="cx" style="display: block; padding: 0 10px">                        $('#visibility .edit-visibility').show().focus();

</span><span class="cx" style="display: block; padding: 0 10px">                        updateText();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -886,7 +887,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                });

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Save the changed timestamp.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $timestampdiv.find('.save-timestamp').click( function( event ) { // crazyhorse - multiple ok cancels

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $timestampdiv.find('.save-timestamp').click( function( event ) { // Crazyhorse - multiple OK cancels.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( updateText() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $timestampdiv.slideUp('fast');

</span><span class="cx" style="display: block; padding: 0 10px">                                $timestampdiv.siblings('a.edit-timestamp').show().focus();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1023,12 +1024,12 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $el.html( '<input type="text" id="new-post-slug" value="' + slug_value + '" autocomplete="off" />' ).children( 'input' ).keydown( function( e ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        var key = e.which;

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // On [enter], just save the new slug, don't save the post.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // On [Enter], just save the new slug, don't save the post.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( 13 === key ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                e.preventDefault();

</span><span class="cx" style="display: block; padding: 0 10px">                                buttons.children( '.save' ).click();

</span><span class="cx" style="display: block; padding: 0 10px">                        }

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // On [esc] cancel the editing.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // On [Esc] cancel the editing.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( 27 === key ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                buttons.children( '.cancel' ).click();

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1173,7 +1174,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">-                // When changing page template, change the editor body class

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // When changing page template, change the editor body class.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $( '#page_template' ).on( 'change.set-editor-class', function() {

</span><span class="cx" style="display: block; padding: 0 10px">                        var editor, body, pageTemplate = $( this ).val() || '';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1191,9 +1192,9 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Save on pressing [ctrl]/[command] + [s] in the Text editor.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Save on pressing [Ctrl]/[Command] + [S] in the Text editor.

</ins><span class="cx" style="display: block; padding: 0 10px">         $textarea.on( 'keydown.wp-autosave', function( event ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Key [s] has code 83.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Key [S] has code 83.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( event.which === 83 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( event.shiftKey || event.altKey || ( isMac && ( ! event.metaKey || event.ctrlKey ) ) || ( ! isMac && ! event.ctrlKey ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                return;

</span></span></pre></div>

<a id="trunksrcjs_enqueuesadminpostboxjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/admin/postbox.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/admin/postbox.js   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/admin/postbox.js     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,7 +32,9 @@

<span class="cx" style="display: block; padding: 0 10px">                 * if the postbox has been closed.

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><span class="cx" style="display: block; padding: 0 10px">                 * @since 4.4.0

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 *

</ins><span class="cx" style="display: block; padding: 0 10px">                  * @memberof postboxes

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 *

</ins><span class="cx" style="display: block; padding: 0 10px">                  * @fires postboxes#postbox-toggled

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><span class="cx" style="display: block; padding: 0 10px">                 * @return {void}

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -90,6 +92,7 @@

<span class="cx" style="display: block; padding: 0 10px">                 * Adds event handlers to all postboxes and screen option on the current page.

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><span class="cx" style="display: block; padding: 0 10px">                 * @since 2.7.0

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 *

</ins><span class="cx" style="display: block; padding: 0 10px">                  * @memberof postboxes

</span><span class="cx" style="display: block; padding: 0 10px">                 *

<span class="cx" style="display: block; padding: 0 10px">                 * @param {string} page The page we are currently on.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -190,6 +193,7 @@

<span class="cx" style="display: block; padding: 0 10px">                 * Initializes all the postboxes, mainly their sortable behaviour.

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><span class="cx" style="display: block; padding: 0 10px">                 * @since 2.7.0

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 *

</ins><span class="cx" style="display: block; padding: 0 10px">                  * @memberof postboxes

</span><span class="cx" style="display: block; padding: 0 10px">                 *

<span class="cx" style="display: block; padding: 0 10px">                 * @param {string} page The page we are currently on.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -272,6 +276,7 @@

<span class="cx" style="display: block; padding: 0 10px">                 * hidden postboxes.

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><span class="cx" style="display: block; padding: 0 10px">                 * @since 2.7.0

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 *

</ins><span class="cx" style="display: block; padding: 0 10px">                  * @memberof postboxes

</span><span class="cx" style="display: block; padding: 0 10px">                 *

<span class="cx" style="display: block; padding: 0 10px">                 * @param {string} page The page we are currently on.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -303,6 +308,7 @@

<span class="cx" style="display: block; padding: 0 10px">                 * Sends a list of all postboxes inside a sortable area to the server.

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><span class="cx" style="display: block; padding: 0 10px">                 * @since 2.8.0

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 *

</ins><span class="cx" style="display: block; padding: 0 10px">                  * @memberof postboxes

</span><span class="cx" style="display: block; padding: 0 10px">                 *

<span class="cx" style="display: block; padding: 0 10px">                 * @param {string} page The page we are currently on.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -333,9 +339,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                 * present.

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><span class="cx" style="display: block; padding: 0 10px">                 * @since 3.3.0

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 * @memberof postboxes

</del><span class="cx" style="display: block; padding: 0 10px">                  * @access private

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 * @memberof postboxes

+                *

</ins><span class="cx" style="display: block; padding: 0 10px">                  * @return {void}

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                _mark_area : function() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -365,9 +372,11 @@

<span class="cx" style="display: block; padding: 0 10px">                 * Changes the amount of columns on the post edit page.

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><span class="cx" style="display: block; padding: 0 10px">                 * @since 3.3.0

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 * @access private

+                *

</ins><span class="cx" style="display: block; padding: 0 10px">                  * @memberof postboxes

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 *

</ins><span class="cx" style="display: block; padding: 0 10px">                  * @fires postboxes#postboxes-columnchange

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 * @access private

</del><span class="cx" style="display: block; padding: 0 10px">                  *

<span class="cx" style="display: block; padding: 0 10px">                 * @param {number} n The amount of columns to divide the post edit page in.

</span><span class="cx" style="display: block; padding: 0 10px">                 * @return {void}

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -395,9 +404,10 @@

<span class="cx" style="display: block; padding: 0 10px">                 * orientation of the browser.

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><span class="cx" style="display: block; padding: 0 10px">                 * @since 3.3.0

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 * @memberof postboxes

</del><span class="cx" style="display: block; padding: 0 10px">                  * @access private

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 * @memberof postboxes

+                *

</ins><span class="cx" style="display: block; padding: 0 10px">                  * @return {void}

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                _pb_change : function() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -425,19 +435,20 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                /**

</span><span class="cx" style="display: block; padding: 0 10px">                 * @since 2.7.0

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 * @memberof postboxes

</del><span class="cx" style="display: block; padding: 0 10px">                  * @access public

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 *

</ins><span class="cx" style="display: block; padding: 0 10px">                  * @property {Function|boolean} pbshow A callback that is called when a postbox

<span class="cx" style="display: block; padding: 0 10px">                 *                                     is opened.

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 * @memberof postboxes

</ins><span class="cx" style="display: block; padding: 0 10px">                  */

</span><span class="cx" style="display: block; padding: 0 10px">                pbshow : false,

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                /**

</span><span class="cx" style="display: block; padding: 0 10px">                 * @since 2.7.0

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 * @memberof postboxes

</del><span class="cx" style="display: block; padding: 0 10px">                  * @access public

</span><span class="cx" style="display: block; padding: 0 10px">                 * @property {Function|boolean} pbhide A callback that is called when a postbox

<span class="cx" style="display: block; padding: 0 10px">                 *                                     is closed.

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 * @memberof postboxes

</ins><span class="cx" style="display: block; padding: 0 10px">                  */

</span><span class="cx" style="display: block; padding: 0 10px">                pbhide : false

</span><span class="cx" style="display: block; padding: 0 10px">        };

</span></span></pre></div>

<a id="trunksrcjs_enqueuesadminprivacytoolsjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/admin/privacy-tools.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/admin/privacy-tools.js     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/admin/privacy-tools.js       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,7 +4,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">  * @output wp-admin/js/privacy-tools.js

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Privacy request action handling

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Privacy request action handling.

</ins><span class="cx" style="display: block; padding: 0 10px"> jQuery( document ).ready( function( $ ) {

</span><span class="cx" style="display: block; padding: 0 10px">        var strings = window.privacyToolsL10n || {};

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -111,7 +111,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( ! response.success ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // e.g. invalid request ID

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // e.g. invalid request ID.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         onExportFailure( response.data );

</span><span class="cx" style="display: block; padding: 0 10px">                                        return;

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -127,12 +127,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px">                        }).fail( function( jqxhr, textStatus, error ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // e.g. Nonce failure

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // e.g. Nonce failure.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 onExportFailure( error );

</span><span class="cx" style="display: 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">-                // And now, let's begin

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // And now, let's begin.

</ins><span class="cx" style="display: block; padding: 0 10px">                 setActionState( $action, 'export-personal-data-processing' );

</span><span class="cx" style="display: block; padding: 0 10px">                doNextExport( 1, 1 );

</span><span class="cx" style="display: block; padding: 0 10px">        });

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -224,7 +224,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">-                // And now, let's begin

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // And now, let's begin.

</ins><span class="cx" style="display: block; padding: 0 10px">                 setActionState( $action, 'remove-personal-data-processing' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                doNextErasure( 1, 1 );

</span></span></pre></div>

<a id="trunksrcjs_enqueuesadminsitehealthjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/admin/site-health.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/admin/site-health.js       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/admin/site-health.js 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -259,9 +259,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        RecalculateProgression();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( delay > 3000  ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // We have announced that we're waiting.

-                               // Announce that we're ready after giving at least 3 seconds for the first announcement

-                               // to be read out, or the two may collide.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         /*

+                                * We have announced that we're waiting.

+                                * Announce that we're ready after giving at least 3 seconds

+                                * for the first announcement to be read out, or the two may collide.

+                                */

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( delay > 6000 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        delay = 0;

</span><span class="cx" style="display: block; padding: 0 10px">                                } else {

</span></span></pre></div>

<a id="trunksrcjs_enqueuesadmintagsboxjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/admin/tags-box.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/admin/tags-box.js  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/admin/tags-box.js    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,6 +52,7 @@

<span class="cx" style="display: block; padding: 0 10px">                 * Cleans up tags by removing redundant characters.

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><span class="cx" style="display: block; padding: 0 10px">                 * @since 2.9.0

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 *

</ins><span class="cx" style="display: block; padding: 0 10px">                  * @memberOf tagBox

</span><span class="cx" style="display: block; padding: 0 10px">                 *

<span class="cx" style="display: block; padding: 0 10px">                 * @param {string} tags Comma separated tags that need to be cleaned up.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,6 +77,7 @@

<span class="cx" style="display: block; padding: 0 10px">                 * Parses tags and makes them editable.

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><span class="cx" style="display: block; padding: 0 10px">                 * @since 2.9.0

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 *

</ins><span class="cx" style="display: block; padding: 0 10px">                  * @memberOf tagBox

</span><span class="cx" style="display: block; padding: 0 10px">                 *

<span class="cx" style="display: block; padding: 0 10px">                 * @param {Object} el The tag element to retrieve the ID from.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -110,6 +112,7 @@

<span class="cx" style="display: block; padding: 0 10px">                 * Creates clickable links, buttons and fields for adding or editing tags.

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><span class="cx" style="display: block; padding: 0 10px">                 * @since 2.9.0

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 *

</ins><span class="cx" style="display: block; padding: 0 10px">                  * @memberOf tagBox

</span><span class="cx" style="display: block; padding: 0 10px">                 *

<span class="cx" style="display: block; padding: 0 10px">                 * @param {Object} el The container HTML element.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -134,6 +137,7 @@

<span class="cx" style="display: block; padding: 0 10px">                         * Creates a delete button if tag editing is enabled, before adding it to the tag list.

</span><span class="cx" style="display: block; padding: 0 10px">                         *

</span><span class="cx" style="display: block; padding: 0 10px">                         * @since 2.5.0

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         *

</ins><span class="cx" style="display: block; padding: 0 10px">                          * @memberOf tagBox

</span><span class="cx" style="display: block; padding: 0 10px">                         *

<span class="cx" style="display: block; padding: 0 10px">                         * @param {string} key The index of the current tag.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -209,6 +213,7 @@

<span class="cx" style="display: block; padding: 0 10px">                 * Also ensures that the quick links are properly generated.

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><span class="cx" style="display: block; padding: 0 10px">                 * @since 2.9.0

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 *

</ins><span class="cx" style="display: block; padding: 0 10px">                  * @memberOf tagBox

</span><span class="cx" style="display: block; padding: 0 10px">                 *

<span class="cx" style="display: block; padding: 0 10px">                 * @param {Object} el The container HTML element.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -262,6 +267,7 @@

<span class="cx" style="display: block; padding: 0 10px">                 * tagcloud. Clicking a tag will add it.

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><span class="cx" style="display: block; padding: 0 10px">                 * @since 2.9.0

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 *

</ins><span class="cx" style="display: block; padding: 0 10px">                  * @memberOf tagBox

</span><span class="cx" style="display: block; padding: 0 10px">                 *

<span class="cx" style="display: block; padding: 0 10px">                 * @param {string} id The ID to extract the taxonomy from.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -350,6 +356,7 @@

<span class="cx" style="display: block; padding: 0 10px">                 * retrieval of tag suggestions.

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><span class="cx" style="display: block; padding: 0 10px">                 * @since 2.9.0

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 *

</ins><span class="cx" style="display: block; padding: 0 10px">                  * @memberOf tagBox

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><span class="cx" style="display: block; padding: 0 10px">                 * @return {void}

</span></span></pre></div>

<a id="trunksrcjs_enqueuesadmintagssuggestjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/admin/tags-suggest.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/admin/tags-suggest.js      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/admin/tags-suggest.js        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -89,8 +89,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        focus: function( event, ui ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $element.attr( 'aria-activedescendant', 'wp-tags-autocomplete-' + ui.item.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">-                                // Don't empty the input field when using the arrow keys to

-                               // highlight items. See api.jqueryui.com/autocomplete/#event-focus

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Don't empty the input field when using the arrow keys

+                               // to highlight items. See api.jqueryui.com/autocomplete/#event-focus

</ins><span class="cx" style="display: block; padding: 0 10px">                                 event.preventDefault();

</span><span class="cx" style="display: block; padding: 0 10px">                        },

</span><span class="cx" style="display: block; padding: 0 10px">                        select: function( event, ui ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -113,7 +113,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                                window.tagBox.flushTags( $( this ).closest( '.tagsdiv' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Do not close Quick Edit / Bulk Edit

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Do not close Quick Edit / Bulk Edit.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         event.preventDefault();

</span><span class="cx" style="display: block; padding: 0 10px">                                        event.stopPropagation();

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -175,14 +175,16 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        .attr( 'role', 'listbox' )

<span class="cx" style="display: block; padding: 0 10px">                        .removeAttr( 'tabindex' ) // Remove the `tabindex=0` attribute added by jQuery UI.

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Looks like Safari and VoiceOver need an `aria-selected` attribute. See ticket #33301.

-                       // The `menufocus` and `menublur` events are the same events used to add and remove

-                       // the `ui-state-focus` CSS class on the menu items. See jQuery UI Menu Widget.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 /*

+                        * Looks like Safari and VoiceOver need an `aria-selected` attribute. See ticket #33301.

+                        * The `menufocus` and `menublur` events are the same events used to add and remove

+                        * the `ui-state-focus` CSS class on the menu items. See jQuery UI Menu Widget.

+                        */

</ins><span class="cx" style="display: block; padding: 0 10px">                         .on( 'menufocus', function( event, ui ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                ui.item.attr( 'aria-selected', 'true' );

</span><span class="cx" style="display: block; padding: 0 10px">                        })

</span><span class="cx" style="display: block; padding: 0 10px">                        .on( 'menublur', function() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // The `menublur` event returns an object where the item is `null`

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // The `menublur` event returns an object where the item is `null`,

</ins><span class="cx" style="display: block; padding: 0 10px">                                 // so we need to find the active item with other means.

</span><span class="cx" style="display: block; padding: 0 10px">                                $( this ).find( '[aria-selected="true"]' ).removeAttr( 'aria-selected' );

</span><span class="cx" style="display: block; padding: 0 10px">                        });

</span></span></pre></div>

<a id="trunksrcjs_enqueuesadmintagsjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/admin/tags.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/admin/tags.js      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/admin/tags.js        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -132,10 +132,14 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        parent = form.find( 'select#parent' ).val();

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( parent > 0 && $('#tag-' + parent ).length > 0 ) // If the parent exists on this page, insert it below. Else insert it at the top of the list.

-                               $( '.tags #tag-' + parent ).after( res.responses[0].supplemental.noparents ); // As the parent exists, Insert the version with - - - prefixed

-                       else

-                               $( '.tags' ).prepend( res.responses[0].supplemental.parents ); // As the parent is not visible, Insert the version with Parent - Child - ThisTerm

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // If the parent exists on this page, insert it below. Else insert it at the top of the list.

+                       if ( parent > 0 && $('#tag-' + parent ).length > 0 ) {

+                               // As the parent exists, insert the version with - - - prefixed.

+                               $( '.tags #tag-' + parent ).after( res.responses[0].supplemental.noparents );

+                       } else {

+                               // As the parent is not visible, insert the version with Parent - Child - ThisTerm.

+                               $( '.tags' ).prepend( res.responses[0].supplemental.parents );

+                       }

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $('.tags .no-items').remove();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -143,7 +147,7 @@

<span class="cx" style="display: block; padding: 0 10px">                                // Parents field exists, Add new term to the list.

</span><span class="cx" style="display: block; padding: 0 10px">                                term = res.responses[1].supplemental;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Create an indent for the Parent field

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Create an indent for the Parent field.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 indent = '';

</span><span class="cx" style="display: block; padding: 0 10px">                                for ( i = 0; i < res.responses[1].position; i++ )

</span><span class="cx" style="display: block; padding: 0 10px">                                        indent += '&nbsp;&nbsp;&nbsp;';

</span></span></pre></div>

<a id="trunksrcjs_enqueuesadminuserprofilejs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/admin/user-profile.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/admin/user-profile.js      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/admin/user-profile.js        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -196,7 +196,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        resetToggle( false );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( $pass1Row.closest( 'form' ).is( '#your-profile' ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Clear password field to prevent update

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Clear password field to prevent update.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $pass1.val( '' ).trigger( 'pwupdate' );

</span><span class="cx" style="display: block; padding: 0 10px">                                $submitButtons.prop( 'disabled', false );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -342,7 +342,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this.siblings( '.selected' ).removeClass( 'selected' );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this.addClass( 'selected' ).find( 'input[type="radio"]' ).prop( 'checked', 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">-                        // Set color scheme

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Set color scheme.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( user_id === current_user_id ) {

<span class="cx" style="display: block; padding: 0 10px">                                // Load the colors stylesheet.

<span class="cx" style="display: block; padding: 0 10px">                                // The default color scheme won't have one, so we'll need to create an element.

</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">                                }

</span><span class="cx" style="display: block; padding: 0 10px">                                $stylesheet.attr( 'href', $this.children( '.css_url' ).val() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // repaint icons

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Repaint icons.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( typeof wp !== 'undefined' && wp.svgPainter ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        try {

</span><span class="cx" style="display: block; padding: 0 10px">                                                colors = $.parseJSON( $this.children( '.icon_colors' ).val() );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -363,7 +363,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">-                                // update user option

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Update user option.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $.post( ajaxurl, {

</span><span class="cx" style="display: block; padding: 0 10px">                                        action:       'save-user-color-scheme',

</span><span class="cx" style="display: block; padding: 0 10px">                                        color_scheme: $this.children( 'input[name="admin_color"]' ).val(),

</span></span></pre></div>

<a id="trunksrcjs_enqueuesadminwidgetsjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/admin/widgets.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/admin/widgets.js   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/admin/widgets.js     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -222,9 +222,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                the_id = this.id;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( chooser.length ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Hide the chooser and move it out of the widget

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Hide the chooser and move it out of the widget.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         $( '#wpbody-content' ).append( chooser.hide() );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Delete the cloned chooser from the drag helper

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Delete the cloned chooser from the drag helper.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         ui.helper.find('.widgets-chooser').remove();

</span><span class="cx" style="display: block; padding: 0 10px">                                        self.clearWidgetSelection();

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -321,7 +321,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                wpWidgets.hoveredSidebar = null;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( $widget.hasClass('deleting') ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        wpWidgets.save( $widget, 1, 0, 1 ); // delete widget

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 wpWidgets.save( $widget, 1, 0, 1 ); // Delete widget.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         $widget.remove();

</span><span class="cx" style="display: block; padding: 0 10px">                                        return;

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -363,7 +363,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                        $children = $sidebar.children('.widget');

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Make sure the dropped widget is at the top

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Make sure the dropped widget is at the top.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         if ( $children.length > 1 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                child = $children.get(0);

</span><span class="cx" style="display: block; padding: 0 10px">                                                item = $widget.get(0);

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -386,7 +386,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        deactivate: function() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Remove all min-height added on "start"

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Remove all min-height added on "start".

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $(this).css( 'min-height', '' ).parent().removeClass( 'widget-hover' );

</span><span class="cx" style="display: block; padding: 0 10px">                        },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -393,7 +393,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        receive: function( event, ui ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                var $sender = $( ui.sender );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Don't add more widgets to orphaned sidebars

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Don't add more widgets to orphaned sidebars.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( this.id.indexOf('orphaned_widgets') > -1 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        $sender.sortable('cancel');

</span><span class="cx" style="display: block; padding: 0 10px">                                        return;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -431,7 +431,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">-                // Area Chooser

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Area Chooser.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $( '#widgets-right .widgets-holder-wrap' ).each( function( index, element ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        var $element = $( element ),

</span><span class="cx" style="display: block; padding: 0 10px">                                name = $element.find( '.sidebar-name h2' ).text(),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -465,7 +465,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                toggleButton.attr( 'aria-expanded', 'false' );

</span><span class="cx" style="display: block; padding: 0 10px">                                self.closeChooser();

</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">-                                // Open the chooser

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Open the chooser.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 self.clearWidgetSelection();

</span><span class="cx" style="display: block; padding: 0 10px">                                $( '#widgets-left' ).addClass( 'chooser' );

<span class="cx" style="display: block; padding: 0 10px">                                // Add CSS class and insert the chooser after the widget description.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -486,7 +486,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">-                // Add event handlers

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Add event handlers.

</ins><span class="cx" style="display: block; padding: 0 10px">                 chooser.on( 'click.widgets-chooser', function( event ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        var $target = $( event.target );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -662,7 +662,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                add = widget.find( 'input.add_new' ).val();

</span><span class="cx" style="display: block; padding: 0 10px">                n = widget.find( 'input.multi_number' ).val();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Remove the cloned chooser from the widget

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Remove the cloned chooser from the widget.

</ins><span class="cx" style="display: block; padding: 0 10px">                 widget.find('.widgets-chooser').remove();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( 'multi' === add ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -689,7 +689,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                sidebar.sortable('refresh');

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                wpWidgets.save( widget, 0, 0, 1 );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // No longer "new" widget

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // No longer "new" widget.

</ins><span class="cx" style="display: block; padding: 0 10px">                 widget.find( 'input.add_new' ).val('');

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $document.trigger( 'widget-added', [ widget ] );

</span></span></pre></div>

<a id="trunksrcjs_enqueueslibaccordionjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/lib/accordion.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/lib/accordion.js   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/lib/accordion.js     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,11 +35,11 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Expand/Collapse accordion sections on click.

</span><span class="cx" style="display: block; padding: 0 10px">                $( '.accordion-container' ).on( 'click keydown', '.accordion-section-title', function( e ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( e.type === 'keydown' && 13 !== e.which ) { // "return" key

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 if ( e.type === 'keydown' && 13 !== e.which ) { // "Return" key.

</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">-                        e.preventDefault(); // Keep this AFTER the key filter above

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 e.preventDefault(); // Keep this AFTER the key filter above.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        accordionSwitch( $( this ) );

</span><span class="cx" style="display: block; padding: 0 10px">                });

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,7 +80,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        section.toggleClass( 'open' );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // We have to wait for the animations to finish

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // We have to wait for the animations to finish.

</ins><span class="cx" style="display: block; padding: 0 10px">                 setTimeout(function(){

</span><span class="cx" style="display: block; padding: 0 10px">                    container.removeClass( 'opening' );

</span><span class="cx" style="display: block; padding: 0 10px">                }, 150);

</span></span></pre></div>

<a id="trunksrcjs_enqueueslibadminbarjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/lib/admin-bar.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/lib/admin-bar.js   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/lib/admin-bar.js     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -264,7 +264,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">-                // (Old) IE doesn't support preventDefault, and does support returnValue

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // (Old) IE doesn't support preventDefault, and does support returnValue.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( event.preventDefault ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        event.preventDefault();

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -451,7 +451,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">-                // Get the closest matching elent

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Get the closest matching elent.

</ins><span class="cx" style="display: block; padding: 0 10px">                 for ( ; el && el !== document; el = el.parentNode ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( el.matches( selector ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                return el;

</span></span></pre></div>

<a id="trunksrcjs_enqueueslibajaxresponsejs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/lib/ajax-response.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/lib/ajax-response.js       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/lib/ajax-response.js 2020-01-29 00:43:23 UTC (rev 47122)

</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">                }

</span><span class="cx" style="display: block; padding: 0 10px">                return r;

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        parseAjaxResponse: function( x, r, e ) { // 1 = good, 0 = strange (bad data?), -1 = you lack permission

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ parseAjaxResponse: function( x, r, e ) { // 1 = good, 0 = strange (bad data?), -1 = you lack permission.

</ins><span class="cx" style="display: block; padding: 0 10px">                 var parsed = {}, re = jQuery('#' + r).empty(), err = '';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( x && typeof x == 'object' && x.getElementsByTagName('wp_ajax') ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -64,7 +64,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> }, wpAjax || { noPerm: 'Sorry, you are not allowed to do that.', broken: 'Something went wrong.' } );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Basic form validation

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Basic form validation.

</ins><span class="cx" style="display: block; padding: 0 10px"> jQuery(document).ready( function($){

</span><span class="cx" style="display: block; padding: 0 10px">        $('form.validate').submit( function() { return wpAjax.validateForm( $(this) ); } );

</span><span class="cx" style="display: block; padding: 0 10px"> });

</span></span></pre></div>

<a id="trunksrcjs_enqueueslibauthcheckjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/lib/auth-check.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/lib/auth-check.js  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/lib/auth-check.js    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,8 +51,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        else

</span><span class="cx" style="display: block; padding: 0 10px">                                                parent.css( 'max-height', height + 40 + 'px' );

</span><span class="cx" style="display: block; padding: 0 10px">                                } else if ( ! body || ! body.length ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Catch "silent" iframe origin exceptions in WebKit after another page is

-                                       // loaded in the iframe.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Catch "silent" iframe origin exceptions in WebKit

+                                       // after another page is loaded in the iframe.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         wrap.addClass('fallback');

</span><span class="cx" style="display: block; padding: 0 10px">                                        parent.css( 'max-height', '' );

</span><span class="cx" style="display: block; padding: 0 10px">                                        form.remove();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -68,9 +68,11 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( frame ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        frame.focus();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // WebKit doesn't throw an error if the iframe fails to load because of

-                       // "X-Frame-Options: DENY" header.

-                       // Wait for 10 sec. and switch to the fallback text.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 /*

+                        * WebKit doesn't throw an error if the iframe fails to load

+                        * because of "X-Frame-Options: DENY" header.

+                        * Wait for 10 seconds and switch to the fallback text.

+                        */

</ins><span class="cx" style="display: block; padding: 0 10px">                         setTimeout( function() {

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( ! loaded ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        wrap.addClass('fallback');

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -92,8 +94,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function hide() {

</span><span class="cx" style="display: block; padding: 0 10px">                $(window).off( 'beforeunload.wp-auth-check' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // When on the Edit Post screen, speed up heartbeat after the user logs in to

-               // quickly refresh nonces.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // When on the Edit Post screen, speed up heartbeat

+               // after the user logs in to quickly refresh nonces.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( typeof adminpage !== 'undefined' && ( adminpage === 'post-php' || adminpage === 'post-new-php' ) &&

</span><span class="cx" style="display: block; padding: 0 10px">                        typeof wp !== 'undefined' && wp.heartbeat ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunksrcjs_enqueueslibcolorpickerjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/lib/color-picker.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/lib/color-picker.js        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/lib/color-picker.js  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,7 +36,6 @@

<span class="cx" style="display: block; padding: 0 10px">                 * Creates a color picker that only allows you to adjust the hue.

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><span class="cx" style="display: block; padding: 0 10px">                 * @since 3.5.0

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 *

</del><span class="cx" style="display: block; padding: 0 10px">                  * @access private

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><span class="cx" style="display: block; padding: 0 10px">                 * @return {void}

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,7 +79,6 @@

<span class="cx" style="display: block; padding: 0 10px">                 * Creates the color picker, sets default values, css classes and wraps it all in HTML.

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><span class="cx" style="display: block; padding: 0 10px">                 * @since 3.5.0

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 *

</del><span class="cx" style="display: block; padding: 0 10px">                  * @access private

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><span class="cx" style="display: block; padding: 0 10px">                 * @return {void}

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -209,7 +207,6 @@

<span class="cx" style="display: block; padding: 0 10px">                 * Binds event listeners to the color picker.

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><span class="cx" style="display: block; padding: 0 10px">                 * @since 3.5.0

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 *

</del><span class="cx" style="display: block; padding: 0 10px">                  * @access private

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><span class="cx" style="display: block; padding: 0 10px">                 * @return {void}

</span></span></pre></div>

<a id="trunksrcjs_enqueueslibcommentreplyjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/lib/comment-reply.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/lib/comment-reply.js       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/lib/comment-reply.js 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -95,7 +95,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                cancelElement.addEventListener( 'touchstart', cancelEvent );

</span><span class="cx" style="display: block; padding: 0 10px">                cancelElement.addEventListener( 'click',      cancelEvent );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Submit the comment form when the user types CTRL or CMD + 'Enter'.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Submit the comment form when the user types [Ctrl] or [Cmd] + [Enter].

</ins><span class="cx" style="display: block; padding: 0 10px">                 var submitFormHandler = function( e ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ( e.metaKey || e.ctrlKey ) && e.keyCode === 13 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                commentFormElement.removeEventListener( 'keydown', submitFormHandler );

</span></span></pre></div>

<a id="trunksrcjs_enqueueslibcookiesjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/lib/cookies.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/lib/cookies.js     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/lib/cookies.js       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,7 +115,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                if ( typeof( expires ) === 'object' && expires.toGMTString ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        expires = expires.toGMTString();

</span><span class="cx" style="display: block; padding: 0 10px">                } else if ( parseInt( expires, 10 ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        d.setTime( d.getTime() + ( parseInt( expires, 10 ) * 1000 ) ); // time must be in milliseconds

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 d.setTime( d.getTime() + ( parseInt( expires, 10 ) * 1000 ) ); // Time must be in milliseconds.

</ins><span class="cx" style="display: block; padding: 0 10px">                         expires = d.toGMTString();

</span><span class="cx" style="display: block; padding: 0 10px">                } else {

</span><span class="cx" style="display: block; padding: 0 10px">                        expires = '';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -153,9 +153,11 @@

</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">-// Both name and value must be only ASCII letters, numbers or underscore

-// and the shorter, the better (cookies can store maximum 4KB). Not suitable to store text.

-// The value is converted and stored as string.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/*

+ * Both name and value must be only ASCII letters, numbers or underscore

+ * and the shorter, the better (cookies can store maximum 4KB). Not suitable to store text.

+ * The value is converted and stored as string.

+ */

</ins><span class="cx" style="display: block; padding: 0 10px"> window.setUserSetting = function( name, value, _del ) {

</span><span class="cx" style="display: block; padding: 0 10px">        if ( 'object' !== typeof userSettings ) {

</span><span class="cx" style="display: block; padding: 0 10px">                return false;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -192,7 +194,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        return setUserSetting( name, '', 1 );

</span><span class="cx" style="display: block; padding: 0 10px"> };

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Returns all settings as js object.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Returns all settings as JS object.

</ins><span class="cx" style="display: block; padding: 0 10px"> window.getAllUserSettings = function() {

</span><span class="cx" style="display: block; padding: 0 10px">        if ( 'object' !== typeof userSettings ) {

</span><span class="cx" style="display: block; padding: 0 10px">                return {};

</span></span></pre></div>

<a id="trunksrcjs_enqueueslibgalleryjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/lib/gallery.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/lib/gallery.js     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/lib/gallery.js       2020-01-29 00:43:23 UTC (rev 47122)

</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">                        distance: 2,

</span><span class="cx" style="display: block; padding: 0 10px">                        handle: 'div.filename',

</span><span class="cx" style="display: block; padding: 0 10px">                        stop: function() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // When an update has occurred, adjust the order for each item

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // When an update has occurred, adjust the order for each item.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 var all = $('#media-items').sortable('toArray'), len = all.length;

</span><span class="cx" style="display: block; padding: 0 10px">                                $.each(all, function(i, id) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        var order = desc ? (len - i) : (1 + i);

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,7 +71,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $('img.pinkynail').toggle(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">-        // initialize sortable

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Initialize sortable.

</ins><span class="cx" style="display: block; padding: 0 10px">         gallerySortableInit();

</span><span class="cx" style="display: block; padding: 0 10px">        clearAll();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -88,7 +88,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> });

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-jQuery(window).unload( function () { window.tinymce = window.tinyMCE = window.wpgallery = null; } ); // Cleanup

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+jQuery(window).unload( function () { window.tinymce = window.tinyMCE = window.wpgallery = null; } ); // Cleanup.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> /* gallery settings */

</span><span class="cx" style="display: block; padding: 0 10px"> window.tinymce = null;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -122,7 +122,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        document.domain = q.mce_rdomain;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Find window & API

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Find window & API.

</ins><span class="cx" style="display: block; padding: 0 10px">                 window.tinymce = w.tinymce;

</span><span class="cx" style="display: block; padding: 0 10px">                window.tinyMCE = w.tinyMCE;

</span><span class="cx" style="display: block; padding: 0 10px">                t.editor = tinymce.EditorManager.activeEditor;

</span></span></pre></div>

<a id="trunksrcjs_enqueueslibimageeditjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/lib/image-edit.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/lib/image-edit.js  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/lib/image-edit.js    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,8 +48,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Converts a value to an integer.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * @since 2.9.0

+        *

</ins><span class="cx" style="display: block; padding: 0 10px">          * @memberof imageEdit

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since    2.9.0

</del><span class="cx" style="display: block; padding: 0 10px">          *

<span class="cx" style="display: block; padding: 0 10px">         * @param {number} f The float value that should be converted.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,8 +67,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Adds the disabled attribute and class to a single form element or a field set.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * @since 2.9.0

+        *

</ins><span class="cx" style="display: block; padding: 0 10px">          * @memberof imageEdit

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since    2.9.0

</del><span class="cx" style="display: block; padding: 0 10px">          *

<span class="cx" style="display: block; padding: 0 10px">         * @param {jQuery}         el The element that should be modified.

</span><span class="cx" style="display: block; padding: 0 10px">         * @param {bool|number}    s  The state for the element. If set to true

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -95,8 +97,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Initializes the image editor.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * @since 2.9.0

+        *

</ins><span class="cx" style="display: block; padding: 0 10px">          * @memberof imageEdit

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since    2.9.0

</del><span class="cx" style="display: block; padding: 0 10px">          *

<span class="cx" style="display: block; padding: 0 10px">         * @param {number} postid The post id.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -121,12 +124,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $('input[type="text"]', '#imgedit-panel-' + postid).keypress(function(e) {

</span><span class="cx" style="display: block; padding: 0 10px">                        var k = e.keyCode;

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Key codes 37 thru 40 are the arrow keys.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Key codes 37 through 40 are the arrow keys.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( 36 < k && k < 41 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $(this).blur();

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // The key code 13 is the enter key.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // The key code 13 is the Enter key.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( 13 === k ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                e.preventDefault();

</span><span class="cx" style="display: block; padding: 0 10px">                                e.stopPropagation();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -138,8 +141,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Toggles the wait/load icon in the editor.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * @since 2.9.0

+        *

</ins><span class="cx" style="display: block; padding: 0 10px">          * @memberof imageEdit

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since    2.9.0

</del><span class="cx" style="display: block; padding: 0 10px">          *

<span class="cx" style="display: block; padding: 0 10px">         * @param {number} postid The post id.

<span class="cx" style="display: block; padding: 0 10px">         * @param {number} toggle Is 0 or 1, fades the icon in then 1 and out when 0.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -159,8 +163,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Shows or hides the image edit help box.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * @since 2.9.0

+        *

</ins><span class="cx" style="display: block; padding: 0 10px">          * @memberof imageEdit

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since    2.9.0

</del><span class="cx" style="display: block; padding: 0 10px">          *

<span class="cx" style="display: block; padding: 0 10px">         * @param {HTMLElement} el The element to create the help window in.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -181,8 +186,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * The image edit target contains the image sizes where the (possible) changes

<span class="cx" style="display: block; padding: 0 10px">         * have to be applied to.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * @since 2.9.0

+        *

</ins><span class="cx" style="display: block; padding: 0 10px">          * @memberof imageEdit

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since    2.9.0

</del><span class="cx" style="display: block; padding: 0 10px">          *

<span class="cx" style="display: block; padding: 0 10px">         * @param {number} postid The post id.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -198,8 +204,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

<span class="cx" style="display: block; padding: 0 10px">         * If the original image size is exceeded a red exclamation mark is shown.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * @since 2.9.0

+        *

</ins><span class="cx" style="display: block; padding: 0 10px">          * @memberof imageEdit

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since    2.9.0

</del><span class="cx" style="display: block; padding: 0 10px">          *

<span class="cx" style="display: block; padding: 0 10px">         * @param {number}         postid The current post id.

</span><span class="cx" style="display: block; padding: 0 10px">         * @param {number}         x      Is 0 when it applies the y-axis

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -234,8 +241,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Gets the selected aspect ratio.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * @since 2.9.0

+        *

</ins><span class="cx" style="display: block; padding: 0 10px">          * @memberof imageEdit

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since    2.9.0

</del><span class="cx" style="display: block; padding: 0 10px">          *

<span class="cx" style="display: block; padding: 0 10px">         * @param {number} postid The post id.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -261,8 +269,9 @@

<span class="cx" style="display: block; padding: 0 10px">         * Removes the last action from the image edit history.

<span class="cx" style="display: block; padding: 0 10px">         * The history consist of (edit) actions performed on the image.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * @since 2.9.0

+        *

</ins><span class="cx" style="display: block; padding: 0 10px">          * @memberof imageEdit

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since    2.9.0

</del><span class="cx" style="display: block; padding: 0 10px">          *

<span class="cx" style="display: block; padding: 0 10px">         * @param {number} postid  The post id.

<span class="cx" style="display: block; padding: 0 10px">         * @param {number} setSize 0 or 1, when 1 the image resets to its original size.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -295,13 +304,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                // Restore original 'o'.

</span><span class="cx" style="display: block; padding: 0 10px">                                o = history[history.length - 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">-                                // c = 'crop', r = 'rotate', f = 'flip'

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // c = 'crop', r = 'rotate', f = 'flip'.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 o = o.c || o.r || o.f || false;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( o ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // fw = Full image width

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // fw = Full image width.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         this.hold.w = o.fw;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // fh = Full image height

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // fh = Full image height.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         this.hold.h = o.fh;

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -326,8 +335,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

<span class="cx" style="display: block; padding: 0 10px">         * When the image source is reloaded the image will be reloaded.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * @since 2.9.0

+        *

</ins><span class="cx" style="display: block; padding: 0 10px">          * @memberof imageEdit

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since    2.9.0

</del><span class="cx" style="display: block; padding: 0 10px">          *

<span class="cx" style="display: block; padding: 0 10px">         * @param {number}   postid   The post id.

<span class="cx" style="display: block; padding: 0 10px">         * @param {string}   nonce    The nonce to verify the request.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -371,7 +381,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                parent.empty().append(img);

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // w, h are the new full size dims

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // w, h are the new full size dimensions.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 max1 = Math.max( t.hold.w, t.hold.h );

</span><span class="cx" style="display: block; padding: 0 10px">                                max2 = Math.max( $(img).width(), $(img).height() );

</span><span class="cx" style="display: block; padding: 0 10px">                                t.hold.sizer = max1 > max2 ? max2 / max1 : 1;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -399,8 +409,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Performs an image edit action.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * @since 2.9.0

+        *

</ins><span class="cx" style="display: block; padding: 0 10px">          * @memberof imageEdit

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since    2.9.0

</del><span class="cx" style="display: block; padding: 0 10px">          *

<span class="cx" style="display: block; padding: 0 10px">         * @param  {number}  postid The post id.

<span class="cx" style="display: block; padding: 0 10px">         * @param  {string}  nonce  The nonce to verify the request.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -456,7 +467,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $.post(ajaxurl, data, function(r) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $('#image-editor-' + postid).empty().append(r);

</span><span class="cx" style="display: block; padding: 0 10px">                        t.toggleEditor(postid, 0);

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // refresh the attachment model so that changes propagate

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Refresh the attachment model so that changes propagate.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( t._view ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                t._view.refresh();

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -466,8 +477,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Stores the changes that are made to the image.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * @since 2.9.0

+        *

</ins><span class="cx" style="display: block; padding: 0 10px">          * @memberof imageEdit

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since    2.9.0

</del><span class="cx" style="display: block; padding: 0 10px">          *

<span class="cx" style="display: block; padding: 0 10px">         * @param {number}  postid   The post id to get the image from the database.

<span class="cx" style="display: block; padding: 0 10px">         * @param {string}  nonce    The nonce to verify the request.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -531,8 +543,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Creates the image edit window.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * @since 2.9.0

+        *

</ins><span class="cx" style="display: block; padding: 0 10px">          * @memberof imageEdit

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since    2.9.0

</del><span class="cx" style="display: block; padding: 0 10px">          *

<span class="cx" style="display: block; padding: 0 10px">         * @param {number} postid   The post id for the image.

<span class="cx" style="display: block; padding: 0 10px">         * @param {string} nonce    The nonce to verify the request.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -588,8 +601,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Initializes the cropping tool and sets a default cropping selection.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * @since 2.9.0

+        *

</ins><span class="cx" style="display: block; padding: 0 10px">          * @memberof imageEdit

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since    2.9.0

</del><span class="cx" style="display: block; padding: 0 10px">          *

<span class="cx" style="display: block; padding: 0 10px">         * @param {number} postid The post id.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -614,8 +628,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Initializes the cropping tool.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * @since 2.9.0

+        *

</ins><span class="cx" style="display: block; padding: 0 10px">          * @memberof imageEdit

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since    2.9.0

</del><span class="cx" style="display: block; padding: 0 10px">          *

<span class="cx" style="display: block; padding: 0 10px">         * @param {number}      postid The post id.

<span class="cx" style="display: block; padding: 0 10px">         * @param {HTMLElement} image  The preview image.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -645,8 +660,8 @@

<span class="cx" style="display: block; padding: 0 10px">                         * @param {jQuery} img The preview image.

</span><span class="cx" style="display: block; padding: 0 10px">                         */

</span><span class="cx" style="display: block; padding: 0 10px">                        onInit: function( img ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Ensure that the imgAreaSelect wrapper elements are position:absolute.

-                               // (even if we're in a position:fixed modal)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Ensure that the imgAreaSelect wrapper elements are position:absolute

+                               // (even if we're in a position:fixed modal).

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $img = $( img );

</span><span class="cx" style="display: block; padding: 0 10px">                                $img.next().css( 'position', 'absolute' )

</span><span class="cx" style="display: block; padding: 0 10px">                                        .nextAll( '.imgareaselect-outer' ).css( 'position', 'absolute' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -715,8 +730,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Stores the current crop selection.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * @since 2.9.0

+        *

</ins><span class="cx" style="display: block; padding: 0 10px">          * @memberof imageEdit

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since    2.9.0

</del><span class="cx" style="display: block; padding: 0 10px">          *

<span class="cx" style="display: block; padding: 0 10px">         * @param {number} postid The post id.

<span class="cx" style="display: block; padding: 0 10px">         * @param {object} c      The selection.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -746,8 +762,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Closes the image editor.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * @since 2.9.0

+        *

</ins><span class="cx" style="display: block; padding: 0 10px">          * @memberof imageEdit

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since    2.9.0

</del><span class="cx" style="display: block; padding: 0 10px">          *

<span class="cx" style="display: block; padding: 0 10px">         * @param {number}  postid The post id.

<span class="cx" style="display: block; padding: 0 10px">         * @param {bool}    warn   Warning message.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -764,13 +781,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">                this.iasapi = {};

</span><span class="cx" style="display: block; padding: 0 10px">                this.hold = {};

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If we've loaded the editor in the context of a Media Modal, then switch to the previous view,

-               // whatever that might have been.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If we've loaded the editor in the context of a Media Modal,

+               // then switch to the previous view, whatever that might have been.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( this._view ){

</span><span class="cx" style="display: block; padding: 0 10px">                        this._view.back();

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // In case we are not accessing the image editor in the context of a View, close the editor the old-skool way

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // In case we are not accessing the image editor in the context of a View,

+               // close the editor the old-school way.

</ins><span class="cx" style="display: block; padding: 0 10px">                 else {

</span><span class="cx" style="display: block; padding: 0 10px">                        $('#image-editor-' + postid).fadeOut('fast', function() {

</span><span class="cx" style="display: block; padding: 0 10px">                                $( '#media-head-' + postid ).fadeIn( 'fast', function() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -787,8 +805,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Checks if the image edit history is saved.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * @since 2.9.0

+        *

</ins><span class="cx" style="display: block; padding: 0 10px">          * @memberof imageEdit

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since    2.9.0

</del><span class="cx" style="display: block; padding: 0 10px">          *

<span class="cx" style="display: block; padding: 0 10px">         * @param {number} postid The post id.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -811,8 +830,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Adds an image edit action to the history.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * @since 2.9.0

+        *

</ins><span class="cx" style="display: block; padding: 0 10px">          * @memberof imageEdit

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since    2.9.0

</del><span class="cx" style="display: block; padding: 0 10px">          *

<span class="cx" style="display: block; padding: 0 10px">         * @param {object} op     The original position.

<span class="cx" style="display: block; padding: 0 10px">         * @param {number} postid The post id.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -830,7 +850,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        history.pop();

</span><span class="cx" style="display: block; padding: 0 10px">                        pop--;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                undone.val(0); // reset

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         undone.val(0); // Reset.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                history.push(op);

</span><span class="cx" style="display: block; padding: 0 10px">                elem.val( JSON.stringify(history) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -844,8 +864,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Rotates the image.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * @since 2.9.0

+        *

</ins><span class="cx" style="display: block; padding: 0 10px">          * @memberof imageEdit

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since    2.9.0

</del><span class="cx" style="display: block; padding: 0 10px">          *

<span class="cx" style="display: block; padding: 0 10px">         * @param {string} angle  The angle the image is rotated with.

<span class="cx" style="display: block; padding: 0 10px">         * @param {number} postid The post id.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -865,8 +886,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Flips the image.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * @since 2.9.0

+        *

</ins><span class="cx" style="display: block; padding: 0 10px">          * @memberof imageEdit

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since    2.9.0

</del><span class="cx" style="display: block; padding: 0 10px">          *

<span class="cx" style="display: block; padding: 0 10px">         * @param {number} axis   The axle the image is flipped on.

<span class="cx" style="display: block; padding: 0 10px">         * @param {number} postid The post id.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -886,8 +908,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Crops the image.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * @since 2.9.0

+        *

</ins><span class="cx" style="display: block; padding: 0 10px">          * @memberof imageEdit

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since    2.9.0

</del><span class="cx" style="display: block; padding: 0 10px">          *

<span class="cx" style="display: block; padding: 0 10px">         * @param {number} postid The post id.

<span class="cx" style="display: block; padding: 0 10px">         * @param {string} nonce  The nonce.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -915,8 +938,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Undoes an image edit action.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * @since 2.9.0

+        *

</ins><span class="cx" style="display: block; padding: 0 10px">          * @memberof imageEdit

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since    2.9.0

</del><span class="cx" style="display: block; padding: 0 10px">          *

<span class="cx" style="display: block; padding: 0 10px">         * @param {number} postid   The post id.

<span class="cx" style="display: block; padding: 0 10px">         * @param {string} nonce    The nonce.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -948,8 +972,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Reverts a undo action.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * @since 2.9.0

+        *

</ins><span class="cx" style="display: block; padding: 0 10px">          * @memberof imageEdit

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since    2.9.0

</del><span class="cx" style="display: block; padding: 0 10px">          *

<span class="cx" style="display: block; padding: 0 10px">         * @param {number} postid The post id.

<span class="cx" style="display: block; padding: 0 10px">         * @param {string} nonce  The nonce.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -978,8 +1003,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Sets the selection for the height and width in pixels.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * @since 2.9.0

+        *

</ins><span class="cx" style="display: block; padding: 0 10px">          * @memberof imageEdit

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since    2.9.0

</del><span class="cx" style="display: block; padding: 0 10px">          *

<span class="cx" style="display: block; padding: 0 10px">         * @param {number} postid The post id.

<span class="cx" style="display: block; padding: 0 10px">         * @param {jQuery} el     The element containing the values.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1035,8 +1061,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Rounds a number to a whole.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * @since 2.9.0

+        *

</ins><span class="cx" style="display: block; padding: 0 10px">          * @memberof imageEdit

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since    2.9.0

</del><span class="cx" style="display: block; padding: 0 10px">          *

<span class="cx" style="display: block; padding: 0 10px">         * @param {number} num The number.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1064,8 +1091,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Sets a locked aspect ratio for the selection.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * @since 2.9.0

+        *

</ins><span class="cx" style="display: block; padding: 0 10px">          * @memberof imageEdit

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since    2.9.0

</del><span class="cx" style="display: block; padding: 0 10px">          *

<span class="cx" style="display: block; padding: 0 10px">         * @param {number} postid     The post id.

<span class="cx" style="display: block; padding: 0 10px">         * @param {number} n          The ratio to set.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1108,8 +1136,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Validates if a value in a jQuery.HTMLElement is numeric.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * @since 4.6.0

+        *

</ins><span class="cx" style="display: block; padding: 0 10px">          * @memberof imageEdit

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since    4.6

</del><span class="cx" style="display: block; padding: 0 10px">          *

<span class="cx" style="display: block; padding: 0 10px">         * @param {jQuery} el The html element.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span></span></pre></div>

<a id="trunksrcjs_enqueuesliblinkjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/lib/link.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/lib/link.js        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/lib/link.js  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,7 +36,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        inputs.submit = $( '#wp-link-submit' );

</span><span class="cx" style="display: block; padding: 0 10px">                        inputs.close = $( '#wp-link-close' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Input

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Input.

</ins><span class="cx" style="display: block; padding: 0 10px">                         inputs.text = $( '#wp-link-text' );

</span><span class="cx" style="display: block; padding: 0 10px">                        inputs.url = $( '#wp-link-url' );

</span><span class="cx" style="display: block; padding: 0 10px">                        inputs.nonce = $( '#_ajax_linking_nonce' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,17 +43,17 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        inputs.openInNewTab = $( '#wp-link-target' );

</span><span class="cx" style="display: block; padding: 0 10px">                        inputs.search = $( '#wp-link-search' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Build Rivers

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Build rivers.

</ins><span class="cx" style="display: block; padding: 0 10px">                         rivers.search = new River( $( '#search-results' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        rivers.recent = new River( $( '#most-recent-results' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        rivers.elements = inputs.dialog.find( '.query-results' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Get search notice text

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Get search notice text.

</ins><span class="cx" style="display: block; padding: 0 10px">                         inputs.queryNotice = $( '#query-notice-message' );

</span><span class="cx" style="display: block; padding: 0 10px">                        inputs.queryNoticeTextDefault = inputs.queryNotice.find( '.query-notice-default' );

</span><span class="cx" style="display: block; padding: 0 10px">                        inputs.queryNoticeTextHint = inputs.queryNotice.find( '.query-notice-hint' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Bind event handlers

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Bind event handlers.

</ins><span class="cx" style="display: block; padding: 0 10px">                         inputs.dialog.keydown( wpLink.keydown );

</span><span class="cx" style="display: block; padding: 0 10px">                        inputs.dialog.keyup( wpLink.keyup );

</span><span class="cx" style="display: block; padding: 0 10px">                        inputs.submit.click( function( event ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -68,7 +68,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        rivers.elements.on( 'river-select', wpLink.updateFields );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Display 'hint' message when search field or 'query-results' box are focused

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Display 'hint' message when search field or 'query-results' box are focused.

</ins><span class="cx" style="display: block; padding: 0 10px">                         inputs.search.on( 'focus.wplink', function() {

</span><span class="cx" style="display: block; padding: 0 10px">                                inputs.queryNoticeTextDefault.hide();

</span><span class="cx" style="display: block; padding: 0 10px">                                inputs.queryNoticeTextHint.removeClass( 'screen-reader-text' ).show();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,7 +91,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        inputs.url.on( 'blur', wpLink.correctURL );

</span><span class="cx" style="display: block; padding: 0 10px">                },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If URL wasn't corrected last time and doesn't start with http:, https:, ? # or /, prepend http://

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If URL wasn't corrected last time and doesn't start with http:, https:, ? # or /, prepend http://.

</ins><span class="cx" style="display: block; padding: 0 10px">                 correctURL: function () {

</span><span class="cx" style="display: block; padding: 0 10px">                        var url = $.trim( inputs.url.val() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -154,7 +154,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                refresh: function( url, text ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        var linkText = '';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Refresh rivers (clear links, check visibility)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Refresh rivers (clear links, check visibility).

</ins><span class="cx" style="display: block; padding: 0 10px">                         rivers.search.refresh();

</span><span class="cx" style="display: block; padding: 0 10px">                        rivers.recent.refresh();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -161,17 +161,17 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( wpLink.isMCE() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                wpLink.mceRefresh( url, text );

</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">-                                // For the Text editor the "Link text" field is always shown

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // For the Text editor the "Link text" field is always shown.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( ! inputs.wrap.hasClass( 'has-text-field' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        inputs.wrap.addClass( 'has-text-field' );

</span><span class="cx" style="display: 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 ( document.selection ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Old IE

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Old IE.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         linkText = document.selection.createRange().text || text || '';

</span><span class="cx" style="display: block; padding: 0 10px">                                } else if ( typeof this.textarea.selectionStart !== 'undefined' &&

</span><span class="cx" style="display: block; padding: 0 10px">                                        ( this.textarea.selectionStart !== this.textarea.selectionEnd ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // W3C

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // W3C.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         text = this.textarea.value.substring( this.textarea.selectionStart, this.textarea.selectionEnd ) || text || '';

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -180,12 +180,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( isTouch ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Close the onscreen keyboard

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Close the onscreen keyboard.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 inputs.url.focus().blur();

</span><span class="cx" style="display: block; padding: 0 10px">                        } else {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Focus the URL field and highlight its contents.

-                               // If this is moved above the selection changes,

-                               // IE will show a flashing cursor over the dialog.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         /*

+                                * Focus the URL field and highlight its contents.

+                                * If this is moved above the selection changes,

+                                * IE will show a flashing cursor over the dialog.

+                                */

</ins><span class="cx" style="display: block; padding: 0 10px">                                 window.setTimeout( function() {

</span><span class="cx" style="display: block; padding: 0 10px">                                        inputs.url[0].select();

</span><span class="cx" style="display: block; padding: 0 10px">                                        inputs.url.focus();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -203,7 +205,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                hasSelectedText: function( linkNode ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        var node, nodes, i, html = editor.selection.getContent();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Partial html and not a fully selected anchor element

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Partial html and not a fully selected anchor element.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( /</.test( html ) && ( ! /^<a [^>]+>[^<]+<\/a>$/.test( html ) || html.indexOf('href=') === -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">@@ -259,7 +261,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        inputs.search.val( '' );

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Always reset the search

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Always reset the search.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 window.setTimeout( function() {

</span><span class="cx" style="display: block; padding: 0 10px">                                        wpLink.searchInternalLinks();

</span><span class="cx" style="display: block; padding: 0 10px">                                } );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -358,11 +360,11 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        html = wpLink.buildHtml(attrs);

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Insert HTML

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Insert HTML.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( document.selection && wpLink.range ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // IE

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // IE.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 // Note: If no text is selected, IE will not place the cursor

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                //       inside the closing tag.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // inside the closing tag.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 textarea.focus();

</span><span class="cx" style="display: block; padding: 0 10px">                                wpLink.range.text = html + ( text || wpLink.range.text ) + '</a>';

</span><span class="cx" style="display: block; padding: 0 10px">                                wpLink.range.moveToBookmark( wpLink.range.getBookmark() );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -370,7 +372,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                wpLink.range = null;

</span><span class="cx" style="display: block; padding: 0 10px">                        } else if ( typeof textarea.selectionStart !== 'undefined' ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // W3C

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // W3C.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 begin = textarea.selectionStart;

</span><span class="cx" style="display: block; padding: 0 10px">                                end = textarea.selectionEnd;

</span><span class="cx" style="display: block; padding: 0 10px">                                selection = text || textarea.value.substring( begin, end );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -388,7 +390,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        textarea.value.substring( end, textarea.value.length )

</span><span class="cx" style="display: block; padding: 0 10px">                                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Update cursor position

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Update cursor position.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 textarea.selectionStart = textarea.selectionEnd = cursor;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -484,10 +486,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        selection = $.trim( selection );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( selection && emailRegexp.test( selection ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Selection is email address

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Selection is email address.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 return 'mailto:' + selection;

</span><span class="cx" style="display: block; padding: 0 10px">                        } else if ( selection && urlRegexp.test( selection ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Selection is URL

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Selection is URL.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 return selection.replace( /&amp;|&#0?38;/gi, '&' );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -553,7 +555,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                id = event.target.id;

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                                // wp-link-submit must always be the last focusable element in the dialog.

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // following focusable elements will be skipped on keyboard navigation.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Following focusable elements will be skipped on keyboard navigation.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( id === 'wp-link-submit' && ! event.shiftKey ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        inputs.close.focus();

</span><span class="cx" style="display: block; padding: 0 10px">                                        event.preventDefault();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -656,18 +658,18 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        this.deselect();

</span><span class="cx" style="display: block; padding: 0 10px">                        this.selected = li.addClass( 'selected' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Make sure the element is visible

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Make sure the element is visible.

</ins><span class="cx" style="display: block; padding: 0 10px">                         liHeight = li.outerHeight();

</span><span class="cx" style="display: block; padding: 0 10px">                        elHeight = this.element.height();

</span><span class="cx" style="display: block; padding: 0 10px">                        liTop = li.position().top;

</span><span class="cx" style="display: block; padding: 0 10px">                        elTop = this.element.scrollTop();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( liTop < 0 ) // Make first visible element

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 if ( liTop < 0 ) // Make first visible element.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 this.element.scrollTop( elTop + liTop );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        else if ( liTop + liHeight > elHeight ) // Make last visible element

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 else if ( liTop + liHeight > elHeight ) // Make last visible element.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 this.element.scrollTop( elTop + liTop - elHeight + liHeight );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Trigger the river-select event

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Trigger the river-select event.

</ins><span class="cx" style="display: block; padding: 0 10px">                         this.element.trigger( 'river-select', [ li, event, this ] );

</span><span class="cx" style="display: block; padding: 0 10px">                },

</span><span class="cx" style="display: block; padding: 0 10px">                deselect: function() {

</span></span></pre></div>

<a id="trunksrcjs_enqueueslibnavmenujs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/lib/nav-menu.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/lib/nav-menu.js    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/lib/nav-menu.js      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -69,7 +69,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                jQueryExtensions : function() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // jQuery extensions

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // jQuery extensions.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $.fn.extend({

</span><span class="cx" style="display: block; padding: 0 10px">                                menuItemDepth : function() {

</span><span class="cx" style="display: block; padding: 0 10px">                                        var margin = api.isRTL ? this.eq(0).css('margin-right') : this.eq(0).css('margin-left');

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -114,7 +114,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                                        depth = t.menuItemDepth(),

</span><span class="cx" style="display: block; padding: 0 10px">                                                        newDepth = depth + dir;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                // Change .menu-item-depth-n class

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         // Change .menu-item-depth-n class.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                 t.moveHorizontally( newDepth, depth );

</span><span class="cx" style="display: block; padding: 0 10px">                                        });

</span><span class="cx" style="display: block; padding: 0 10px">                                },

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -125,10 +125,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                                        diff = newDepth - depth,

</span><span class="cx" style="display: block; padding: 0 10px">                                                        subItemText = t.find('.is-submenu');

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                // Change .menu-item-depth-n class

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         // Change .menu-item-depth-n class.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                 t.updateDepthClass( newDepth, depth ).updateParentMenuItemDBId();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                // If it has children, move those too

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         // If it has children, move those too.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                 if ( children ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                        children.each(function() {

</span><span class="cx" style="display: block; padding: 0 10px">                                                                var t = $(this),

</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"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                // Show "Sub item" helper text

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         // Show "Sub item" helper text.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                 if (0 === newDepth)

</span><span class="cx" style="display: block; padding: 0 10px">                                                        subItemText.hide();

</span><span class="cx" style="display: block; padding: 0 10px">                                                else

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -153,7 +153,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                                        parentDepth = depth - 1,

</span><span class="cx" style="display: block; padding: 0 10px">                                                        parent = item.prevAll( '.menu-item-depth-' + parentDepth ).first();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                if ( 0 === depth ) { // Item is on the top level, has no parent

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         if ( 0 === depth ) { // Item is on the top level, has no parent.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                         input.val(0);

<span class="cx" style="display: block; padding: 0 10px">                                                } else { // Find the parent item, and retrieve its object id.

</span><span class="cx" style="display: block; padding: 0 10px">                                                        input.val( parent.find( '.menu-item-data-db-id' ).val() );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -191,10 +191,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                                if ( !checkboxes.length )

</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">-                                                // Show the ajax spinner

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         // Show the Ajax spinner.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                 t.find( '.button-controls .spinner' ).addClass( 'is-active' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                // Retrieve menu item data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         // Retrieve menu item data.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                 $(checkboxes).each(function(){

</span><span class="cx" style="display: block; padding: 0 10px">                                                        var t = $(this),

</span><span class="cx" style="display: block; padding: 0 10px">                                                                listItemDBIDMatch = re.exec( t.attr('name') ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -205,9 +205,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                                        menuItems[listItemDBID] = t.closest('li').getItemData( 'add-menu-item', listItemDBID );

</span><span class="cx" style="display: block; padding: 0 10px">                                                });

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                // Add the items

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         // Add the items.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                 api.addItemToMenu(menuItems, processMethod, function(){

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                        // Deselect the items and hide the ajax spinner

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 // Deselect the items and hide the Ajax spinner.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                         checkboxes.prop( 'checked', false );

</span><span class="cx" style="display: block; padding: 0 10px">                                                        t.find( '.button-controls .select-all' ).prop( 'checked', false );

</span><span class="cx" style="display: block; padding: 0 10px">                                                        t.find( '.button-controls .spinner' ).removeClass( 'is-active' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -312,15 +312,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        case 'up':

</span><span class="cx" style="display: block; padding: 0 10px">                                newItemPosition = thisItemPosition - 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">-                                // Already at top

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Already at top.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( 0 === thisItemPosition )

</span><span class="cx" style="display: block; padding: 0 10px">                                        break;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // If a sub item is moved to top, shift it to 0 depth

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // If a sub item is moved to top, shift it to 0 depth.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( 0 === newItemPosition && 0 !== thisItemDepth )

</span><span class="cx" style="display: block; padding: 0 10px">                                        thisItem.moveHorizontally( 0, thisItemDepth );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // If prev item is sub item, shift to match depth

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // If prev item is sub item, shift to match depth.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( 0 !== prevItemDepth )

</span><span class="cx" style="display: block; padding: 0 10px">                                        thisItem.moveHorizontally( prevItemDepth, thisItemDepth );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -327,7 +327,7 @@

<span class="cx" style="display: block; padding: 0 10px">                                // Does this item have sub items?

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( thisItemChildren ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        items = thisItem.add( thisItemChildren );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Move the entire block

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Move the entire block.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         items.detach().insertBefore( menuItems.eq( newItemPosition ) ).updateParentMenuItemDBId();

</span><span class="cx" style="display: block; padding: 0 10px">                                } else {

</span><span class="cx" style="display: block; padding: 0 10px">                                        thisItem.detach().insertBefore( menuItems.eq( newItemPosition ) ).updateParentMenuItemDBId();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -351,11 +351,11 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                        items.detach().insertAfter( menuItems.eq( thisItemPosition + items.length ) ).updateParentMenuItemDBId();

</span><span class="cx" style="display: block; padding: 0 10px">                                } else {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // If next item has sub items, shift depth

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // If next item has sub items, shift depth.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         if ( 0 !== nextItemChildren.length )

</span><span class="cx" style="display: block; padding: 0 10px">                                                thisItem.moveHorizontally( nextItemDepth, thisItemDepth );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Have we reached the bottom

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Have we reached the bottom?

</ins><span class="cx" style="display: block; padding: 0 10px">                                         if ( menuItemsCount === thisItemPosition + 1 )

</span><span class="cx" style="display: block; padding: 0 10px">                                                break;

</span><span class="cx" style="display: block; padding: 0 10px">                                        thisItem.detach().insertAfter( menuItems.eq( thisItemPosition + 1 ) ).updateParentMenuItemDBId();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -362,13 +362,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px">                                break;

</span><span class="cx" style="display: block; padding: 0 10px">                        case 'top':

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Already at top

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Already at top.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( 0 === thisItemPosition )

</span><span class="cx" style="display: block; padding: 0 10px">                                        break;

<span class="cx" style="display: block; padding: 0 10px">                                // Does this item have sub items?

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( thisItemChildren ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        items = thisItem.add( thisItemChildren );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Move the entire block

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Move the entire block.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         items.detach().insertBefore( menuItems.eq( 0 ) ).updateParentMenuItemDBId();

</span><span class="cx" style="display: block; padding: 0 10px">                                } else {

</span><span class="cx" style="display: block; padding: 0 10px">                                        thisItem.detach().insertBefore( menuItems.eq( 0 ) ).updateParentMenuItemDBId();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -375,16 +375,16 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px">                                break;

</span><span class="cx" style="display: block; padding: 0 10px">                        case 'left':

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // As far left as possible

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // As far left as possible.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( 0 === thisItemDepth )

</span><span class="cx" style="display: block; padding: 0 10px">                                        break;

</span><span class="cx" style="display: block; padding: 0 10px">                                thisItem.shiftHorizontally( -1 );

</span><span class="cx" style="display: block; padding: 0 10px">                                break;

</span><span class="cx" style="display: block; padding: 0 10px">                        case 'right':

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Can't be sub item at top

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Can't be sub item at top.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( 0 === thisItemPosition )

</span><span class="cx" style="display: block; padding: 0 10px">                                        break;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Already sub item of prevItem

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Already sub item of prevItem.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( thisItemData['menu-item-parent-id'] === prevItemId )

</span><span class="cx" style="display: block; padding: 0 10px">                                        break;

</span><span class="cx" style="display: block; padding: 0 10px">                                thisItem.shiftHorizontally( 1 );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -402,7 +402,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        api.refreshKeyboardAccessibility();

</span><span class="cx" style="display: block; padding: 0 10px">                        api.refreshAdvancedAccessibility();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Refresh the accessibility when the user comes close to the item in any way

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Refresh the accessibility when the user comes close to the item in any way.

</ins><span class="cx" style="display: block; padding: 0 10px">                         menu.on( 'mouseenter.refreshAccessibility focus.refreshAccessibility touchstart.refreshAccessibility' , '.menu-item' , function(){

</span><span class="cx" style="display: block; padding: 0 10px">                                api.refreshAdvancedAccessibilityOfItem( $( this ).find( 'a.item-edit' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        } );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -412,7 +412,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                api.refreshAdvancedAccessibilityOfItem( $( this ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        } );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Links for moving items

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Links for moving items.

</ins><span class="cx" style="display: block; padding: 0 10px">                         menu.on( 'click', '.menus-move', function () {

</span><span class="cx" style="display: block; padding: 0 10px">                                var $this = $( this ),

</span><span class="cx" style="display: block; padding: 0 10px">                                        dir = $this.data( 'dir' );

</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">                refreshAdvancedAccessibilityOfItem : function( itemToRefresh ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Only refresh accessibility when necessary

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Only refresh accessibility when necessary.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( true !== $( itemToRefresh ).data( 'needs_accessibility_refresh' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                return;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -494,7 +494,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                itemPosition = primaryItems.index( menuItem ) + 1,

</span><span class="cx" style="display: block; padding: 0 10px">                                totalMenuItems = primaryItems.length,

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // String together help text for primary menu items

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // String together help text for primary menu items.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 title = menus.menuFocus.replace( '%1$s', itemName ).replace( '%2$d', itemPosition ).replace( '%3$d', totalMenuItems );

</span><span class="cx" style="display: block; padding: 0 10px">                        } else {

</span><span class="cx" style="display: block; padding: 0 10px">                                parentItem = menuItem.prevAll( '.menu-item-depth-' + parseInt( depth - 1, 10 ) ).first(),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -503,13 +503,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                subItems = $( '.menu-item .menu-item-data-parent-id[value="' + parentItemId + '"]' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                itemPosition = $( subItems.parents('.menu-item').get().reverse() ).index( menuItem ) + 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">-                                // String together help text for sub menu items

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // String together help text for sub menu items.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 title = menus.subMenuFocus.replace( '%1$s', itemName ).replace( '%2$d', itemPosition ).replace( '%3$s', parentItemName );

</span><span class="cx" style="display: 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.attr( 'aria-label', title );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Mark this item's accessibility as refreshed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Mark this item's accessibility as refreshed.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this.data( 'needs_accessibility_refresh', 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">@@ -523,10 +523,10 @@

<span class="cx" style="display: block; padding: 0 10px">                        // Hide all the move buttons by default.

</span><span class="cx" style="display: block; padding: 0 10px">                        $( '.menu-item-settings .field-move .menus-move' ).hide();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Mark all menu items as unprocessed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Mark all menu items as unprocessed.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $( 'a.item-edit' ).data( 'needs_accessibility_refresh', 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">-                        // All open items have to be refreshed or they will show no links

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // All open items have to be refreshed or they will show no links.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $( '.menu-item-edit-active a.item-edit' ).each( function() {

</span><span class="cx" style="display: block; padding: 0 10px">                                api.refreshAdvancedAccessibilityOfItem( this );

</span><span class="cx" style="display: block; padding: 0 10px">                        } );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -541,18 +541,18 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                                thisItem = $this.parents( 'li.menu-item' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                                thisItemData = thisItem.getItemData();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Bail if it's not an arrow key

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Bail if it's not an arrow key.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         if ( 37 != e.which && 38 != e.which && 39 != e.which && 40 != e.which )

</span><span class="cx" style="display: block; padding: 0 10px">                                                return;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Avoid multiple keydown events

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Avoid multiple keydown events.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         $this.off('keydown');

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Bail if there is only one menu item

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Bail if there is only one menu item.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         if ( 1 === $('#menu-to-edit li').length )

</span><span class="cx" style="display: block; padding: 0 10px">                                                return;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // If RTL, swap left/right arrows

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // If RTL, swap left/right arrows.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         arrows = { '38': 'up', '40': 'down', '37': 'left', '39': 'right' };

</span><span class="cx" style="display: block; padding: 0 10px">                                        if ( $('body').hasClass('rtl') )

</span><span class="cx" style="display: block; padding: 0 10px">                                                arrows = { '38' : 'up', '40' : 'down', '39' : 'left', '37' : 'right' };

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -571,7 +571,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                                api.moveMenuItem( $this, 'right' );

</span><span class="cx" style="display: block; padding: 0 10px">                                                break;

</span><span class="cx" style="display: block; padding: 0 10px">                                        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Put focus back on same menu item

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Put focus back on same menu item.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         $( '#edit-' + thisItemData['menu-item-db-id'] ).focus();

</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">@@ -594,10 +594,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                initToggles : function() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // init postboxes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Init postboxes.

</ins><span class="cx" style="display: block; padding: 0 10px">                         postboxes.add_postbox_toggles('nav-menus');

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // adjust columns functions for menus UI

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Adjust columns functions for menus UI.

</ins><span class="cx" style="display: block; padding: 0 10px">                         columns.useCheckboxesForHidden();

</span><span class="cx" style="display: block; padding: 0 10px">                        columns.checked = function(field) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $('.field-' + field).removeClass('hidden-field');

</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">                        columns.unchecked = function(field) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $('.field-' + field).addClass('hidden-field');

</span><span class="cx" style="display: block; padding: 0 10px">                        };

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // hide fields

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Hide fields.

</ins><span class="cx" style="display: block; padding: 0 10px">                         api.menuList.hideAdvancedMenuItemFields();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $('.hide-postbox-tog').click(function () {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -639,7 +639,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                start: function(e, ui) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        var height, width, parent, children, tempHolder;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // handle placement for rtl orientation

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Handle placement for RTL orientation.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         if ( api.isRTL )

</span><span class="cx" style="display: block; padding: 0 10px">                                                ui.item[0].style.right = 'auto';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -649,8 +649,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        originalDepth = ui.item.menuItemDepth();

</span><span class="cx" style="display: block; padding: 0 10px">                                        updateCurrentDepth(ui, originalDepth);

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Attach child elements to parent

-                                       // Skip the placeholder

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Attach child elements to parent.

+                                       // Skip the placeholder.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         parent = ( ui.item.next()[0] == ui.placeholder[0] ) ? ui.item.next() : ui.item;

</span><span class="cx" style="display: block; padding: 0 10px">                                        children = parent.childMenuItems();

</span><span class="cx" style="display: block; padding: 0 10px">                                        transport.append( children );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -657,11 +657,11 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                                        // Update the height of the placeholder to match the moving item.

</span><span class="cx" style="display: block; padding: 0 10px">                                        height = transport.outerHeight();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // If there are children, account for distance between top of children and parent

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // If there are children, account for distance between top of children and parent.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         height += ( height > 0 ) ? (ui.placeholder.css('margin-top').slice(0, -2) * 1) : 0;

</span><span class="cx" style="display: block; padding: 0 10px">                                        height += ui.helper.outerHeight();

</span><span class="cx" style="display: block; padding: 0 10px">                                        helperHeight = height;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        height -= 2; // Subtract 2 for borders

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 height -= 2;                                              // Subtract 2 for borders.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         ui.placeholder.height(height);

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                                        // Update the width of the placeholder to match the moving item.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -670,18 +670,18 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                                var depth = $(this).menuItemDepth();

</span><span class="cx" style="display: block; padding: 0 10px">                                                maxChildDepth = (depth > maxChildDepth) ? depth : maxChildDepth;

</span><span class="cx" style="display: block; padding: 0 10px">                                        });

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        width = ui.helper.find('.menu-item-handle').outerWidth(); // Get original width

-                                       width += api.depthToPx(maxChildDepth - originalDepth); // Account for children

-                                       width -= 2; // Subtract 2 for borders

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 width = ui.helper.find('.menu-item-handle').outerWidth(); // Get original width.

+                                       width += api.depthToPx(maxChildDepth - originalDepth);    // Account for children.

+                                       width -= 2;                                               // Subtract 2 for borders.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         ui.placeholder.width(width);

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                                        // Update the list of menu items.

</span><span class="cx" style="display: block; padding: 0 10px">                                        tempHolder = ui.placeholder.next( '.menu-item' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        tempHolder.css( 'margin-top', helperHeight + 'px' ); // Set the margin to absorb the placeholder

-                                       ui.placeholder.detach(); // detach or jQuery UI will think the placeholder is a menu item

-                                       $(this).sortable( 'refresh' ); // The children aren't sortable. We should let jQ UI know.

-                                       ui.item.after( ui.placeholder ); // reattach the placeholder.

-                                       tempHolder.css('margin-top', 0); // reset the margin

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 tempHolder.css( 'margin-top', helperHeight + 'px' ); // Set the margin to absorb the placeholder.

+                                       ui.placeholder.detach();         // Detach or jQuery UI will think the placeholder is a menu item.

+                                       $(this).sortable( 'refresh' );   // The children aren't sortable. We should let jQuery UI know.

+                                       ui.item.after( ui.placeholder ); // Reattach the placeholder.

+                                       tempHolder.css('margin-top', 0); // Reset the margin.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                                        // Now that the element is complete, we can update...

</span><span class="cx" style="display: block; padding: 0 10px">                                        updateSharedVars(ui);

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -690,10 +690,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        var children, subMenuTitle,

</span><span class="cx" style="display: block; padding: 0 10px">                                                depthChange = currentDepth - originalDepth;

</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 child elements to the list

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Return child elements to the list.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         children = transport.children().insertAfter(ui.item);

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Add "sub menu" description

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Add "sub menu" description.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         subMenuTitle = ui.item.find( '.item-title .is-submenu' );

</span><span class="cx" style="display: block; padding: 0 10px">                                        if ( 0 < currentDepth )

</span><span class="cx" style="display: block; padding: 0 10px">                                                subMenuTitle.show();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -700,21 +700,21 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        else

</span><span class="cx" style="display: block; padding: 0 10px">                                                subMenuTitle.hide();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Update depth classes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Update depth classes.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         if ( 0 !== depthChange ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                ui.item.updateDepthClass( currentDepth );

</span><span class="cx" style="display: block; padding: 0 10px">                                                children.shiftDepthClass( depthChange );

</span><span class="cx" style="display: block; padding: 0 10px">                                                updateMenuMaxDepth( depthChange );

</span><span class="cx" style="display: block; padding: 0 10px">                                        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Register a change

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Register a change.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         api.registerChange();

<span class="cx" style="display: block; padding: 0 10px">                                        // Update the item data.

</span><span class="cx" style="display: block; padding: 0 10px">                                        ui.item.updateParentMenuItemDBId();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // address sortable's incorrectly-calculated top in opera

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Address sortable's incorrectly-calculated top in Opera.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         ui.item[0].style.top = 0;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // handle drop placement for rtl orientation

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Handle drop placement for rtl orientation.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         if ( api.isRTL ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                ui.item[0].style.left = 'auto';

</span><span class="cx" style="display: block; padding: 0 10px">                                                ui.item[0].style.right = 0;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -736,9 +736,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                                edge = api.isRTL ? offset.left + ui.helper.width() : offset.left,

</span><span class="cx" style="display: block; padding: 0 10px">                                                depth = api.negateIfRTL * api.pxToDepth( edge - menuEdge );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Check and correct if depth is not within range.

-                                       // Also, if the dragged element is dragged upwards over

-                                       // an item, shift the placeholder to a child position.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 /*

+                                        * Check and correct if depth is not within range.

+                                        * Also, if the dragged element is dragged upwards over an item,

+                                        * shift the placeholder to a child position.

+                                        */

</ins><span class="cx" style="display: block; padding: 0 10px">                                         if ( depth > maxDepth || offset.top < ( prevBottom - api.options.targetTolerance ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                depth = maxDepth;

</span><span class="cx" style="display: block; padding: 0 10px">                                        } else if ( depth < minDepth ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -748,7 +750,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        if( depth != currentDepth )

</span><span class="cx" style="display: block; padding: 0 10px">                                                updateCurrentDepth(ui, depth);

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // If we overlap the next element, manually shift downwards

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // If we overlap the next element, manually shift downwards.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         if( nextThreshold && offset.top + helperHeight > nextThreshold ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                next.after( ui.placeholder );

</span><span class="cx" style="display: block; padding: 0 10px">                                                updateSharedVars( ui );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -955,12 +957,12 @@

</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">-                        // Show the ajax spinner

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Show the Ajax spinner.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $( '.customlinkdiv .spinner' ).addClass( 'is-active' );

</span><span class="cx" style="display: block; padding: 0 10px">                        this.addLinkToMenu( url, label, processMethod, function() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Remove the ajax spinner

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Remove the Ajax spinner.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $( '.customlinkdiv .spinner' ).removeClass( 'is-active' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Set custom link form back to defaults

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Set custom link form back to defaults.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $('#custom-menu-item-name').val('').blur();

</span><span class="cx" style="display: block; padding: 0 10px">                                $( '#custom-menu-item-url' ).val( '' ).attr( 'placeholder', 'https://' );

</span><span class="cx" style="display: block; padding: 0 10px">                        });

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -997,10 +999,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $.post( ajaxurl, params, function(menuMarkup) {

</span><span class="cx" style="display: block; padding: 0 10px">                                var ins = $('#menu-instructions');

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                menuMarkup = $.trim( menuMarkup ); // Trim leading whitespaces

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         menuMarkup = $.trim( menuMarkup ); // Trim leading whitespaces.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 processMethod(menuMarkup, params);

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Make it stand out a bit more visually, by adding a fadeIn

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Make it stand out a bit more visually, by adding a fadeIn.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $( 'li.pending' ).hide().fadeIn('slow');

</span><span class="cx" style="display: block; padding: 0 10px">                                $( '.drag-instructions' ).show();

</span><span class="cx" style="display: block; padding: 0 10px">                                if( ! ins.hasClass( 'menu-instructions-inactive' ) && ins.siblings().length )

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1051,7 +1053,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                                return navMenuL10n.saveAlert;

</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">-                                // Make the post boxes read-only, as they can't be used yet

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Make the post boxes read-only, as they can't be used yet.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $( '#menu-settings-column' ).find( 'input,select' ).end().find( 'a' ).attr( 'href', '#' ).unbind( 'click' );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                },

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1071,7 +1073,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                        wrapper = target.parents('.accordion-section-content').first();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // upon changing tabs, we want to uncheck all checkboxes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Upon changing tabs, we want to uncheck all checkboxes.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         $( 'input', wrapper ).prop( 'checked', false );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                        $('.tabs-panel-active', wrapper).removeClass('tabs-panel-active').addClass('tabs-panel-inactive');

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1080,7 +1082,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        $('.tabs', wrapper).removeClass('tabs');

</span><span class="cx" style="display: block; padding: 0 10px">                                        target.parent().addClass('tabs');

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // select the search bar

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Select the search bar.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         $('.quick-search', wrapper).focus();

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                                        // Hide controls in the search tab if no items found.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1193,17 +1195,17 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        var locs = '',

</span><span class="cx" style="display: block; padding: 0 10px">                        menuName = $('#menu-name'),

</span><span class="cx" style="display: block; padding: 0 10px">                        menuNameVal = menuName.val();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Cancel and warn if invalid menu name

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Cancel and warn if invalid menu name.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( ! menuNameVal || ! menuNameVal.replace( /\s+/, '' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                menuName.parent().addClass( 'form-invalid' );

</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">-                        // Copy menu theme locations

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Copy menu theme locations.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $('#nav-menu-theme-locations select').each(function() {

</span><span class="cx" style="display: block; padding: 0 10px">                                locs += '<input type="hidden" name="' + this.name + '" value="' + $(this).val() + '" />';

</span><span class="cx" style="display: block; padding: 0 10px">                        });

</span><span class="cx" style="display: block; padding: 0 10px">                        $('#update-nav-menu').append( locs );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Update menu item position data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Update menu item position data.

</ins><span class="cx" style="display: block; padding: 0 10px">                         api.menuList.find('.menu-item-data-position').val( function(index) { return index + 1; } );

</span><span class="cx" style="display: block; padding: 0 10px">                        window.onbeforeunload = null;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1211,7 +1213,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">                eventOnClickMenuDelete : function() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Delete warning AYS

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Delete warning AYS.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( window.confirm( navMenuL10n.warnDeleteMenu ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                window.onbeforeunload = null;

</span><span class="cx" style="display: block; padding: 0 10px">                                return true;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1253,7 +1255,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $items.each(function(){

</span><span class="cx" style="display: block; padding: 0 10px">                                $item = $(this);

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // make a unique DB ID number

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Make a unique DB ID number.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 matched = pattern.exec($item.html());

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( matched && matched[1] ) {

</span></span></pre></div>

<a id="trunksrcjs_enqueueslibpointerjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/lib/pointer.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/lib/pointer.js     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/lib/pointer.js       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -90,11 +90,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        var o   = this.options,

</span><span class="cx" style="display: block; padding: 0 10px">                                tip = this.pointer;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Handle document transfer

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Handle document transfer.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( key === 'document' && value !== o.document ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                tip.detach().appendTo( value.body );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Handle class change

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Handle class change.

</ins><span class="cx" style="display: block; padding: 0 10px">                         } else if ( key === 'pointerClass' ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                tip.removeClass( o.pointerClass ).addClass( value );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -102,11 +102,11 @@

<span class="cx" style="display: block; padding: 0 10px">                        // Call super method.

</span><span class="cx" style="display: block; padding: 0 10px">                        $.Widget.prototype._setOption.apply( this, arguments );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Reposition automatically

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Reposition automatically.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( key === 'position' ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                this.reposition();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Update content automatically if pointer is open

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Update content automatically if pointer is open.

</ins><span class="cx" style="display: block; padding: 0 10px">                         } else if ( key === 'content' && this.active ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                this.update();

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -234,7 +234,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        }).show().position($.extend({

</span><span class="cx" style="display: block; padding: 0 10px">                                of: this.element,

</span><span class="cx" style="display: block; padding: 0 10px">                                collision: 'fit none'

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        }, position )); // the object comes before this.options.position so the user can override position.of.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 }, position )); // The object comes before this.options.position so the user can override position.of.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        this.repoint();

</span><span class="cx" style="display: block; padding: 0 10px">                },

</span></span></pre></div>

<a id="trunksrcjs_enqueueslibquicktagsjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/lib/quicktags.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/lib/quicktags.js   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/lib/quicktags.js     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,7 +20,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">  * @output wp-includes/js/quicktags.js

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// new edit toolbar used with permission

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// New edit toolbar used with permission

</ins><span class="cx" style="display: block; padding: 0 10px"> // by Alex King

</span><span class="cx" style="display: block; padding: 0 10px"> // http://www.alexking.org/

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,7 +52,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> /* jshint ignore:end */

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> (function(){

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // private stuff is prefixed with an underscore

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Private stuff is prefixed with an underscore.

</ins><span class="cx" style="display: block; padding: 0 10px">         var _domReady = function(func) {

</span><span class="cx" style="display: block; padding: 0 10px">                var t, i, DOMContentLoaded, _tryReady;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -150,7 +150,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                t.settings = settings;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( id === 'content' && typeof(adminpage) === 'string' && ( adminpage === 'post-new-php' || adminpage === 'post-php' ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // back compat hack :-(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Back compat hack :-(

</ins><span class="cx" style="display: block; padding: 0 10px">                         window.edCanvas = canvas;

</span><span class="cx" style="display: block; padding: 0 10px">                        toolbar_id = 'ed_toolbar';

</span><span class="cx" style="display: block; padding: 0 10px">                } else {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -168,19 +168,19 @@

</span><span class="cx" style="display: block; padding: 0 10px">                canvas.parentNode.insertBefore(tb, canvas);

</span><span class="cx" style="display: block; padding: 0 10px">                t.toolbar = tb;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // listen for click events

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Listen for click events.

</ins><span class="cx" style="display: block; padding: 0 10px">                 onclick = function(e) {

</span><span class="cx" style="display: block; padding: 0 10px">                        e = e || window.event;

</span><span class="cx" style="display: block; padding: 0 10px">                        var target = e.target || e.srcElement, visible = target.clientWidth || target.offsetWidth, i;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // don't call the callback on pressing the accesskey when the button is not visible

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Don't call the callback on pressing the accesskey when the button is not visible.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( !visible ) {

</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">-                        // as long as it has the class ed_button, execute the callback

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // As long as it has the class ed_button, execute the callback.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( / ed_button /.test(' ' + target.className + ' ') ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // we have to reassign canvas here

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // We have to reassign canvas here.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 t.canvas = canvas = document.getElementById(id);

</span><span class="cx" style="display: block; padding: 0 10px">                                i = target.id.replace(name + '_', '');

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -261,7 +261,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        theButtons = {};

</span><span class="cx" style="display: block; padding: 0 10px">                        use = '';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // set buttons

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Set buttons.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( settings.buttons ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                use = ','+settings.buttons+',';

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -361,7 +361,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 ( priority === -1 ) { // back-compat

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( priority === -1 ) { // Back-compat.

</ins><span class="cx" style="display: block; padding: 0 10px">                         return btn;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -376,7 +376,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( this.buttonsInitDone ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        this._buttonsInit(); // add the button HTML to all instances toolbars if addButton() was called too late

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 this._buttonsInit(); // Add the button HTML to all instances toolbars if addButton() was called too late.

</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">@@ -387,12 +387,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        return false;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( document.selection ) { //IE

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( document.selection ) { // IE.

</ins><span class="cx" style="display: block; padding: 0 10px">                         canvas.focus();

</span><span class="cx" style="display: block; padding: 0 10px">                        sel = document.selection.createRange();

</span><span class="cx" style="display: block; padding: 0 10px">                        sel.text = content;

</span><span class="cx" style="display: block; padding: 0 10px">                        canvas.focus();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                } else if ( canvas.selectionStart || canvas.selectionStart === 0 ) { // FF, WebKit, Opera

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         } else if ( canvas.selectionStart || canvas.selectionStart === 0 ) { // FF, WebKit, Opera.

</ins><span class="cx" style="display: block; padding: 0 10px">                         text = canvas.value;

</span><span class="cx" style="display: block; padding: 0 10px">                        startPos = canvas.selectionStart;

</span><span class="cx" style="display: block; padding: 0 10px">                        endPos = canvas.selectionEnd;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -420,7 +420,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                return true;

</span><span class="cx" style="display: block; padding: 0 10px">        };

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // a plain, dumb button

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // A plain, dumb button.

</ins><span class="cx" style="display: block; padding: 0 10px">         qt.Button = function( id, display, access, title, instance, attr ) {

</span><span class="cx" style="display: block; padding: 0 10px">                this.id = id;

</span><span class="cx" style="display: block; padding: 0 10px">                this.display = display;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -450,7 +450,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        };

</span><span class="cx" style="display: block; padding: 0 10px">        qt.Button.prototype.callback = function(){};

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // a button that inserts HTML tag

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // A button that inserts HTML tag.

</ins><span class="cx" style="display: block; padding: 0 10px">         qt.TagButton = function( id, display, tagStart, tagEnd, access, title, instance, attr ) {

</span><span class="cx" style="display: block; padding: 0 10px">                var t = this;

</span><span class="cx" style="display: block; padding: 0 10px">                qt.Button.call( t, id, display, access, title, instance, attr );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -485,7 +485,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        element.setAttribute( 'aria-label', this.attr.ariaLabel );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        };

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // whether a tag is open or not. Returns false if not open, or current open depth of the tag

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Whether a tag is open or not. Returns false if not open, or current open depth of the tag.

</ins><span class="cx" style="display: block; padding: 0 10px">         qt.TagButton.prototype.isOpen = function (ed) {

</span><span class="cx" style="display: block; padding: 0 10px">                var t = this, i = 0, ret = false;

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ed.openTags ) {

</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">        qt.TagButton.prototype.callback = function(element, canvas, ed) {

</span><span class="cx" style="display: block; padding: 0 10px">                var t = this, startPos, endPos, cursorPos, scrollTop, v = canvas.value, l, r, i, sel, endTag = v ? t.tagEnd : '', event;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( document.selection ) { // IE

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( document.selection ) { // IE.

</ins><span class="cx" style="display: block; padding: 0 10px">                         canvas.focus();

</span><span class="cx" style="display: block; padding: 0 10px">                        sel = document.selection.createRange();

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( sel.text.length > 0 ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -522,7 +522,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">                        canvas.focus();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                } else if ( canvas.selectionStart || canvas.selectionStart === 0 ) { // FF, WebKit, Opera

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         } else if ( canvas.selectionStart || canvas.selectionStart === 0 ) { // FF, WebKit, Opera.

</ins><span class="cx" style="display: block; padding: 0 10px">                         startPos = canvas.selectionStart;

</span><span class="cx" style="display: block; padding: 0 10px">                        endPos = canvas.selectionEnd;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -532,12 +532,12 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        cursorPos = endPos;

</span><span class="cx" style="display: block; padding: 0 10px">                        scrollTop = canvas.scrollTop;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        l = v.substring(0, startPos); // left of the selection

-                       r = v.substring(endPos, v.length); // right of the selection

-                       i = v.substring(startPos, endPos); // inside the selection

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 l = v.substring(0, startPos);      // Left of the selection.

+                       r = v.substring(endPos, v.length); // Right of the selection.

+                       i = v.substring(startPos, endPos); // Inside the selection.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( startPos !== endPos ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( !t.tagEnd ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        canvas.value = l + i + t.tagStart + r; // insert self closing tags after the selection

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 canvas.value = l + i + t.tagStart + r; // Insert self-closing tags after the selection.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         cursorPos += t.tagStart.length;

</span><span class="cx" style="display: block; padding: 0 10px">                                } else {

</span><span class="cx" style="display: block; padding: 0 10px">                                        canvas.value = l + t.tagStart + i + endTag + r;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -562,7 +562,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        canvas.selectionEnd = cursorPos;

</span><span class="cx" style="display: block; padding: 0 10px">                        canvas.scrollTop = scrollTop;

</span><span class="cx" style="display: block; padding: 0 10px">                        canvas.focus();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                } else { // other browsers?

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         } else { // Other browsers?

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( !endTag ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                canvas.value += t.tagStart;

</span><span class="cx" style="display: block; padding: 0 10px">                        } else if ( t.isOpen(ed) !== false ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -584,10 +584,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        };

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // removed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Removed.

</ins><span class="cx" style="display: block; padding: 0 10px">         qt.SpellButton = function() {};

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // the close tags button

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // The close tags button.

</ins><span class="cx" style="display: block; padding: 0 10px">         qt.CloseButton = function() {

</span><span class="cx" style="display: block; padding: 0 10px">                qt.Button.call( this, 'close', quicktagsL10n.closeTags, '', quicktagsL10n.closeAllOpenTags );

</span><span class="cx" style="display: block; padding: 0 10px">        };

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -621,7 +621,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">-        // the link button

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // The link button.

</ins><span class="cx" style="display: block; padding: 0 10px">         qt.LinkButton = function() {

</span><span class="cx" style="display: block; padding: 0 10px">                var attr = {

</span><span class="cx" style="display: block; padding: 0 10px">                        ariaLabel: quicktagsL10n.link

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -653,7 +653,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        };

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // the img button

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // The img button.

</ins><span class="cx" style="display: block; padding: 0 10px">         qt.ImgButton = function() {

</span><span class="cx" style="display: block; padding: 0 10px">                var attr = {

</span><span class="cx" style="display: block; padding: 0 10px">                        ariaLabel: quicktagsL10n.image

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -704,14 +704,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">                c.focus();

</span><span class="cx" style="display: block; padding: 0 10px">        };

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // ensure backward compatibility

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Ensure backward compatibility.

</ins><span class="cx" style="display: block; padding: 0 10px">         edButtons[10]  = new qt.TagButton( 'strong', 'b', '<strong>', '</strong>', '', '', '', { ariaLabel: quicktagsL10n.strong, ariaLabelClose: quicktagsL10n.strongClose } );

</span><span class="cx" style="display: block; padding: 0 10px">        edButtons[20]  = new qt.TagButton( 'em', 'i', '<em>', '</em>', '', '', '', { ariaLabel: quicktagsL10n.em, ariaLabelClose: quicktagsL10n.emClose } );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        edButtons[30]  = new qt.LinkButton(); // special case

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ edButtons[30]  = new qt.LinkButton(); // Special case.

</ins><span class="cx" style="display: block; padding: 0 10px">         edButtons[40]  = new qt.TagButton( 'block', 'b-quote', '\n\n<blockquote>', '</blockquote>\n\n', '', '', '', { ariaLabel: quicktagsL10n.blockquote, ariaLabelClose: quicktagsL10n.blockquoteClose } );

</span><span class="cx" style="display: block; padding: 0 10px">        edButtons[50]  = new qt.TagButton( 'del', 'del', '<del datetime="' + _datetime + '">', '</del>', '', '', '', { ariaLabel: quicktagsL10n.del, ariaLabelClose: quicktagsL10n.delClose } );

</span><span class="cx" style="display: block; padding: 0 10px">        edButtons[60]  = new qt.TagButton( 'ins', 'ins', '<ins datetime="' + _datetime + '">', '</ins>', '', '', '', { ariaLabel: quicktagsL10n.ins, ariaLabelClose: quicktagsL10n.insClose } );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        edButtons[70]  = new qt.ImgButton(); // special case

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ edButtons[70]  = new qt.ImgButton();  // Special case.

</ins><span class="cx" style="display: block; padding: 0 10px">         edButtons[80]  = new qt.TagButton( 'ul', 'ul', '<ul>\n', '</ul>\n\n', '', '', '', { ariaLabel: quicktagsL10n.ul, ariaLabelClose: quicktagsL10n.ulClose } );

</span><span class="cx" style="display: block; padding: 0 10px">        edButtons[90]  = new qt.TagButton( 'ol', 'ol', '<ol>\n', '</ol>\n\n', '', '', '', { ariaLabel: quicktagsL10n.ol, ariaLabelClose: quicktagsL10n.olClose } );

</span><span class="cx" style="display: block; padding: 0 10px">        edButtons[100] = new qt.TagButton( 'li', 'li', '\t<li>', '</li>\n', '', '', '', { ariaLabel: quicktagsL10n.li, ariaLabelClose: quicktagsL10n.liClose } );

</span></span></pre></div>

<a id="trunksrcjs_enqueuesvendorpluploadhandlersjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/vendor/plupload/handlers.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/vendor/plupload/handlers.js        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/vendor/plupload/handlers.js  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,18 +1,18 @@

</span><span class="cx" style="display: block; padding: 0 10px"> /* global plupload, pluploadL10n, ajaxurl, post_id, wpUploaderInit, deleteUserSetting, setUserSetting, getUserSetting, shortform */

</span><span class="cx" style="display: block; padding: 0 10px"> var topWin = window.dialogArguments || opener || parent || top, uploader, uploader_init;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// progress and success handlers for media multi uploads

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Progress and success handlers for media multi uploads.

</ins><span class="cx" style="display: block; padding: 0 10px"> function fileQueued( fileObj ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Get rid of unused form

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Get rid of unused form.

</ins><span class="cx" style="display: block; padding: 0 10px">         jQuery( '.media-blank' ).remove();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        var items = jQuery( '#media-items' ).children(), postid = post_id || 0;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Collapse a single item

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Collapse a single item.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( items.length == 1 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                items.removeClass( 'open' ).find( '.slidetoggle' ).slideUp( 200 );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Create a progress bar containing the filename

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Create a progress bar containing the filename.

</ins><span class="cx" style="display: block; padding: 0 10px">         jQuery( '<div class="media-item">' )

</span><span class="cx" style="display: block; padding: 0 10px">                .attr( 'id', 'media-item-' + fileObj.id )

</span><span class="cx" style="display: block; padding: 0 10px">                .addClass( 'child-of-' + postid )

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,7 +20,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        jQuery( '<div class="filename original">' ).text( ' ' + fileObj.name ) )

</span><span class="cx" style="display: block; padding: 0 10px">                .appendTo( jQuery( '#media-items' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Disable submit

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Disable submit.

</ins><span class="cx" style="display: block; padding: 0 10px">         jQuery( '#insert-gallery' ).prop( 'disabled', 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">@@ -40,7 +40,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        jQuery( '.percent', item ).html( file.percent + '%' );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// check to see if a large file failed to upload

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Check to see if a large file failed to upload.

</ins><span class="cx" style="display: block; padding: 0 10px"> function fileUploading( up, file ) {

</span><span class="cx" style="display: block; padding: 0 10px">        var hundredmb = 100 * 1024 * 1024,

</span><span class="cx" style="display: block; padding: 0 10px">                max = parseInt( up.settings.max_file_size, 10 );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -47,13 +47,13 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( max > hundredmb && file.size > hundredmb ) {

</span><span class="cx" style="display: block; padding: 0 10px">                setTimeout( function() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( file.status < 3 && file.loaded === 0 ) { // not uploading

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 if ( file.status < 3 && file.loaded === 0 ) { // Not uploading.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 wpFileError( file, pluploadL10n.big_upload_failed.replace( '%1$s', '<a class="uploader-html" href="#">' ).replace( '%2$s', '</a>' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                up.stop(); // stops the whole queue

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         up.stop();  // Stop the whole queue.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 up.removeFile( file );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                up.start(); // restart the queue

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         up.start(); // Restart the queue.

</ins><span class="cx" style="display: block; padding: 0 10px">                         }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                }, 10000 ); // wait for 10 sec. for the file to start uploading

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         }, 10000 ); // Wait for 10 seconds for the file to start uploading.

</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">@@ -60,7 +60,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> function updateMediaForm() {

</span><span class="cx" style="display: block; padding: 0 10px">        var items = jQuery( '#media-items' ).children();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Just one file, no need for collapsible part

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Just one file, no need for collapsible part.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( items.length == 1 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                items.addClass( 'open' ).find( '.slidetoggle' ).show();

</span><span class="cx" style="display: block; padding: 0 10px">                jQuery( '.insert-gallery' ).hide();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,11 +80,12 @@

</span><span class="cx" style="display: block; padding: 0 10px"> function uploadSuccess( fileObj, serverData ) {

</span><span class="cx" style="display: block; padding: 0 10px">        var item = jQuery( '#media-item-' + fileObj.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">-        // on success serverData should be numeric, fix bug in html4 runtime returning the serverData wrapped in a <pre> tag

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // On success serverData should be numeric,

+       // fix bug in html4 runtime returning the serverData wrapped in a <pre> tag.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( typeof serverData === 'string' ) {

</span><span class="cx" style="display: block; padding: 0 10px">                serverData = serverData.replace( /^<pre>(\d+)<\/pre>$/, '$1' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // if async-upload returned an error message, place it in the media item div and return

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If async-upload returned an error message, place it in the media item div and return.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( /media-upload-error|error-div/.test( serverData ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        item.html( serverData );

</span><span class="cx" style="display: block; padding: 0 10px">                        return;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -129,10 +130,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        topWin.jQuery( '#TB_overlay' ).click( topWin.tb_remove );

</span><span class="cx" style="display: block; padding: 0 10px">        } catch( e ){}

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        if ( isNaN( serverData ) || !serverData ) { // Old style: Append the HTML returned by the server -- thumbnail and form inputs

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isNaN( serverData ) || !serverData ) {

+               // Old style: Append the HTML returned by the server -- thumbnail and form inputs.

</ins><span class="cx" style="display: block; padding: 0 10px">                 item.append( serverData );

</span><span class="cx" style="display: block; padding: 0 10px">                prepareMediaItemInit( fileObj );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        } else { // New style: server data is just the attachment ID, fetch the thumbnail and form html from the server

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {

+               // New style: server data is just the attachment ID, fetch the thumbnail and form html from the server.

</ins><span class="cx" style="display: block; padding: 0 10px">                 item.load( 'async-upload.php', {attachment_id:serverData, fetch:f}, function(){prepareMediaItemInit( fileObj );updateMediaForm();});

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -139,15 +142,15 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> function prepareMediaItemInit( fileObj ) {

</span><span class="cx" style="display: block; padding: 0 10px">        var item = jQuery( '#media-item-' + fileObj.id );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Clone the thumbnail as a "pinkynail" -- a tiny image to the left of the filename

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Clone the thumbnail as a "pinkynail" -- a tiny image to the left of the filename.

</ins><span class="cx" style="display: block; padding: 0 10px">         jQuery( '.thumbnail', item ).clone().attr( 'class', 'pinkynail toggle' ).prependTo( item );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Replace the original filename with the new (unique) one assigned during upload

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Replace the original filename with the new (unique) one assigned during upload.

</ins><span class="cx" style="display: block; padding: 0 10px">         jQuery( '.filename.original', item ).replaceWith( jQuery( '.filename.new', item ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Bind AJAX to the new Delete button

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Bind AJAX to the new Delete button.

</ins><span class="cx" style="display: block; padding: 0 10px">         jQuery( 'a.delete', item ).click( function(){

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Tell the server to delete it. TODO: handle exceptions

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Tell the server to delete it. TODO: Handle exceptions.

</ins><span class="cx" style="display: block; padding: 0 10px">                 jQuery.ajax({

</span><span class="cx" style="display: block; padding: 0 10px">                        url: ajaxurl,

</span><span class="cx" style="display: block; padding: 0 10px">                        type: 'post',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -163,9 +166,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                return false;

</span><span class="cx" style="display: block; padding: 0 10px">        });

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Bind AJAX to the new Undo button

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Bind AJAX to the new Undo button.

</ins><span class="cx" style="display: block; padding: 0 10px">         jQuery( 'a.undo', item ).click( function(){

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Tell the server to untrash it. TODO: handle exceptions

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Tell the server to untrash it. TODO: Handle exceptions.

</ins><span class="cx" style="display: block; padding: 0 10px">                 jQuery.ajax({

</span><span class="cx" style="display: block; padding: 0 10px">                        url: ajaxurl,

</span><span class="cx" style="display: block; padding: 0 10px">                        type: 'post',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -195,16 +198,16 @@

</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">-        // Open this item if it says to start open (e.g. to display an error)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Open this item if it says to start open (e.g. to display an error).

</ins><span class="cx" style="display: block; padding: 0 10px">         jQuery( '#media-item-' + fileObj.id + '.startopen' ).removeClass( 'startopen' ).addClass( 'open' ).find( 'slidetoggle' ).fadeIn();

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// generic error message

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Generic error message.

</ins><span class="cx" style="display: block; padding: 0 10px"> function wpQueueError( message ) {

</span><span class="cx" style="display: block; padding: 0 10px">        jQuery( '#media-upload-error' ).show().html( '<div class="error"><p>' + message + '</p></div>' );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// file-specific error messages

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// File-specific error messages.

</ins><span class="cx" style="display: block; padding: 0 10px"> function wpFileError( fileObj, message ) {

</span><span class="cx" style="display: block; padding: 0 10px">        itemAjaxError( fileObj.id, message );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -212,7 +215,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> function itemAjaxError( id, message ) {

</span><span class="cx" style="display: block; padding: 0 10px">        var item = jQuery( '#media-item-' + id ), filename = item.find( '.filename' ).text(), last_err = item.data( 'last-err' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        if ( last_err == id ) // prevent firing an error for the same file twice

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( last_err == id ) // Prevent firing an error for the same file twice.

</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">        item.html( '<div class="error-div">' +

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -274,7 +277,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                if ( typeof( uploader ) == 'object' )

</span><span class="cx" style="display: block; padding: 0 10px">                        uploader.refresh();

</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">-                setUserSetting( 'uploader', '1' ); // 1 == html uploader

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         setUserSetting( 'uploader', '1' ); // 1 == html uploader.

</ins><span class="cx" style="display: block; padding: 0 10px">                 jQuery( '.media-upload-form' ).addClass( 'html-uploader' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -365,7 +368,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $( '.media-upload-form' ).bind( 'click.uploader', function( e ) {

</span><span class="cx" style="display: block; padding: 0 10px">                var target = $( e.target ), tr, c;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( target.is( 'input[type="radio"]' ) ) { // remember the last used image size and alignment

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( target.is( 'input[type="radio"]' ) ) { // Remember the last used image size and alignment.

</ins><span class="cx" style="display: block; padding: 0 10px">                         tr = target.closest( 'tr' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( tr.hasClass( 'align' ) )

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -373,7 +376,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        else if ( tr.hasClass( 'image-size' ) )

</span><span class="cx" style="display: block; padding: 0 10px">                                setUserSetting( 'imgsize', target.val() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                } else if ( target.is( 'button.button' ) ) { // remember the last used image link url

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         } else if ( target.is( 'button.button' ) ) { // Remember the last used image link url.

</ins><span class="cx" style="display: block; padding: 0 10px">                         c = e.target.className || '';

</span><span class="cx" style="display: block; padding: 0 10px">                        c = c.match( /url([^ '"]+)/ );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -385,15 +388,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        target.parents( '.media-item' ).fadeOut( 200, function() {

</span><span class="cx" style="display: block; padding: 0 10px">                                $( this ).remove();

</span><span class="cx" style="display: block; padding: 0 10px">                        } );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                } else if ( target.is( '.upload-flash-bypass a' ) || target.is( 'a.uploader-html' ) ) { // switch uploader to html4

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         } else if ( target.is( '.upload-flash-bypass a' ) || target.is( 'a.uploader-html' ) ) { // Switch uploader to html4.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $( '#media-items, p.submit, span.big-file-warning' ).css( 'display', 'none' );

</span><span class="cx" style="display: block; padding: 0 10px">                        switchUploader( 0 );

</span><span class="cx" style="display: block; padding: 0 10px">                        e.preventDefault();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                } else if ( target.is( '.upload-html-bypass a' ) ) { // switch uploader to multi-file

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         } else if ( target.is( '.upload-html-bypass a' ) ) { // Switch uploader to multi-file.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $( '#media-items, p.submit, span.big-file-warning' ).css( 'display', '' );

</span><span class="cx" style="display: block; padding: 0 10px">                        switchUploader( 1 );

</span><span class="cx" style="display: block; padding: 0 10px">                        e.preventDefault();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                } else if ( target.is( 'a.describe-toggle-on' ) ) { // Show

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         } else if ( target.is( 'a.describe-toggle-on' ) ) { // Show.

</ins><span class="cx" style="display: block; padding: 0 10px">                         target.parent().addClass( 'open' );

</span><span class="cx" style="display: block; padding: 0 10px">                        target.siblings( '.slidetoggle' ).fadeIn( 250, function() {

</span><span class="cx" style="display: block; padding: 0 10px">                                var S = $( window ).scrollTop(),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -417,7 +420,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">                        e.preventDefault();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                } else if ( target.is( 'a.describe-toggle-off' ) ) { // Hide

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         } else if ( target.is( 'a.describe-toggle-off' ) ) { // Hide.

</ins><span class="cx" style="display: block; padding: 0 10px">                         target.siblings( '.slidetoggle' ).fadeOut( 250, function() {

</span><span class="cx" style="display: block; padding: 0 10px">                                target.parent().removeClass( 'open' );

</span><span class="cx" style="display: block; padding: 0 10px">                        } );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -450,9 +453,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                times = tryAgainCount[ file.id ];

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( times && times > 4 ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // The file may have been uploaded and attachment post created,

-                       // but post-processing and resizing failed...

-                       // Do a cleanup then tell the user to scale down the image and upload it again.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 /*

+                        * The file may have been uploaded and attachment post created,

+                        * but post-processing and resizing failed...

+                        * Do a cleanup then tell the user to scale down the image and upload it again.

+                        */

</ins><span class="cx" style="display: block; padding: 0 10px">                         $.ajax({

</span><span class="cx" style="display: block; padding: 0 10px">                                type: 'post',

</span><span class="cx" style="display: block; padding: 0 10px">                                url: ajaxurl,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -514,7 +519,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">-        // init and set the uploader

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Init and set the uploader.

</ins><span class="cx" style="display: block; padding: 0 10px">         uploader_init = function() {

</span><span class="cx" style="display: block; padding: 0 10px">                uploader = new plupload.Uploader( wpUploaderInit );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunksrcjs_enqueuesvendorpluploadwppluploadjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/vendor/plupload/wp-plupload.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/vendor/plupload/wp-plupload.js     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/vendor/plupload/wp-plupload.js       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,7 +33,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        Uploader = function( options ) {

</span><span class="cx" style="display: block; padding: 0 10px">                var self = this,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        isIE, // not used, back-compat

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 isIE, // Not used, back-compat.

</ins><span class="cx" style="display: block; padding: 0 10px">                         elements = {

</span><span class="cx" style="display: block; padding: 0 10px">                                container: 'container',

</span><span class="cx" style="display: block; padding: 0 10px">                                browser:   'browse_button',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,10 +60,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                this.plupload = $.extend( true, { multipart_params: {} }, Uploader.defaults );

<span class="cx" style="display: block; padding: 0 10px">                this.container = document.body; // Set default container.

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Extend the instance with options.

-               //

-               // Use deep extend to allow options.plupload to override individual

-               // default plupload keys.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /*

+                * Extend the instance with options.

+                *

+                * Use deep extend to allow options.plupload to override individual

+                * default plupload keys.

+                */

</ins><span class="cx" style="display: block; padding: 0 10px">                 $.extend( true, this, options );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Proxy all methods so this always refers to the current instance.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -138,9 +140,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        times = tryAgainCount[ file.id ];

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( times && times > 4 ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // The file may have been uploaded and attachment post created,

-                               // but post-processing and resizing failed...

-                               // Do a cleanup then tell the user to scale down the image and upload it again.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         /*

+                                * The file may have been uploaded and attachment post created,

+                                * but post-processing and resizing failed...

+                                * Do a cleanup then tell the user to scale down the image and upload it again.

+                                */

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $.ajax({

</span><span class="cx" style="display: block; padding: 0 10px">                                        type: 'post',

</span><span class="cx" style="display: block; padding: 0 10px">                                        url: ajaxurl,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -238,7 +242,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                fileUploaded = function( up, file, response ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        var complete;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Remove the "uploading" UI elements

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Remove the "uploading" UI elements.

</ins><span class="cx" style="display: block; padding: 0 10px">                         _.each( ['file','loaded','size','percent'], function( key ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                file.attachment.unset( key );

</span><span class="cx" style="display: block; padding: 0 10px">                        } );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -295,11 +299,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">                        dropzone.bind('dragleave.wp-uploader, drop.wp-uploader', function() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Using an instant timer prevents the drag-over class from

-                               // being quickly removed and re-added when elements inside the

-                               // dropzone are repositioned.

-                               //

-                               // @see https://core.trac.wordpress.org/ticket/21705

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         /*

+                                * Using an instant timer prevents the drag-over class

+                                * from being quickly removed and re-added when elements

+                                * inside the dropzone are repositioned.

+                                *

+                                * @see https://core.trac.wordpress.org/ticket/21705

+                                */

</ins><span class="cx" style="display: block; padding: 0 10px">                                 timer = setTimeout( function() {

</span><span class="cx" style="display: block; padding: 0 10px">                                        active = false;

</span><span class="cx" style="display: block; padding: 0 10px">                                        dropzone.trigger('dropzone:leave').removeClass('drag-over');

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -513,9 +519,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        node = node.parentNode;

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // If the browser node is not attached to the DOM, use a

-                               // temporary container to house it, as the browser button

-                               // shims require the button to exist in the DOM at all times.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         /*

+                                * If the browser node is not attached to the DOM,

+                                * use a temporary container to house it, as the browser button shims 

+                                * require the button to exist in the DOM at all times.

+                                */

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( ! attached ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        id = 'wp-uploader-browser-' + this.uploader.id;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunksrcjs_enqueuesvendortinymcepluginscompat3xpluginjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/vendor/tinymce/plugins/compat3x/plugin.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/vendor/tinymce/plugins/compat3x/plugin.js  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/vendor/tinymce/plugins/compat3x/plugin.js    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,7 +44,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">     this.add = function (callback, scope, prepend) {

</span><span class="cx" style="display: block; padding: 0 10px">       log('<target>.on' + newEventName + ".add(..)");

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-      // Convert callback({arg1:x, arg2:x}) -> callback(arg1, arg2)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+      // Convert callback({arg1:x, arg2:x}) -> callback(arg1, arg2).

</ins><span class="cx" style="display: block; padding: 0 10px">       function patchedEventCallback(e) {

</span><span class="cx" style="display: block; padding: 0 10px">         var callbackArgs = [];

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunksrcjs_enqueuesvendortinymcepluginswordpresspluginjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/vendor/tinymce/plugins/wordpress/plugin.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/vendor/tinymce/plugins/wordpress/plugin.js 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/vendor/tinymce/plugins/wordpress/plugin.js   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,6 @@

</span><span class="cx" style="display: block; padding: 0 10px"> /* global getUserSetting, setUserSetting */

</span><span class="cx" style="display: block; padding: 0 10px"> ( function( tinymce ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Set the minimum value for the modals z-index higher than #wpadminbar (100000)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Set the minimum value for the modals z-index higher than #wpadminbar (100000).

</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! tinymce.ui.FloatPanel.zIndex || tinymce.ui.FloatPanel.zIndex < 100100 ) {

</span><span class="cx" style="display: block; padding: 0 10px">        tinymce.ui.FloatPanel.zIndex = 100100;

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -88,7 +88,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        });

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Hide the toolbars after loading

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Hide the toolbars after loading.

</ins><span class="cx" style="display: block; padding: 0 10px">         editor.on( 'PostRender', function() {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( editor.getParam( 'wordpress_adv_hidden', true ) && getUserSetting( 'hidetb', '0' ) === '0' ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        toggleToolbars( 'hide' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -191,7 +191,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        });

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Display the tag name instead of img in element path

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Display the tag name instead of img in element path.

</ins><span class="cx" style="display: block; padding: 0 10px">         editor.on( 'ResolveName', function( event ) {

</span><span class="cx" style="display: block; padding: 0 10px">                var attr;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -200,7 +200,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">-        // Register commands

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Register commands.

</ins><span class="cx" style="display: block; padding: 0 10px">         editor.addCommand( 'WP_More', function( tag ) {

</span><span class="cx" style="display: block; padding: 0 10px">                var parent, html, title,

</span><span class="cx" style="display: block; padding: 0 10px">                        classname = 'wp-more-tag',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -215,13 +215,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                html = '<img src="' + tinymce.Env.transparentSrc + '" alt="" title="' + title + '" class="' + classname + '" ' +

</span><span class="cx" style="display: block; padding: 0 10px">                        'data-wp-more="' + tag + '" data-mce-resize="false" data-mce-placeholder="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">-                // Most common case

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Most common case.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( node === rootNode || ( node.nodeName === 'P' && node.parentNode === rootNode ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        editor.insertContent( html );

</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">-                // Get the top level parent node

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Get the top level parent node.

</ins><span class="cx" style="display: block; padding: 0 10px">                 parent = dom.getParent( node, function( found ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( found.parentNode && found.parentNode === rootNode ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                return true;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -328,7 +328,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                html = '<div class="wp-editor-help">';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Main section, default and additional shortcuts

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Main section, default and additional shortcuts.

</ins><span class="cx" style="display: block; padding: 0 10px">                 html = html +

</span><span class="cx" style="display: block; padding: 0 10px">                        '<h2>' + __( 'Default shortcuts,' ) + ' ' + meta + '</h2>' +

</span><span class="cx" style="display: block; padding: 0 10px">                        '<table class="wp-help-th-center fixed">' +

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -342,7 +342,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        '</table>';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( editor.plugins.wptextpattern && ( ! tinymce.Env.ie || tinymce.Env.ie > 8 ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Text pattern section

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Text pattern section.

</ins><span class="cx" style="display: block; padding: 0 10px">                         html = html +

</span><span class="cx" style="display: block; padding: 0 10px">                                '<h2>' + __( 'When starting a new paragraph with one of these formatting shortcuts followed by a space, the formatting will be applied automatically. Press Backspace or Escape to undo.' ) + '</h2>' +

</span><span class="cx" style="display: block; padding: 0 10px">                                '<table class="wp-help-th-center fixed">' +

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -363,7 +363,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                '</table>';

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Focus management section

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Focus management section.

</ins><span class="cx" style="display: block; padding: 0 10px">                 html = html +

</span><span class="cx" style="display: block; padding: 0 10px">                        '<h2>' + __( 'Focus shortcuts:' ) + '</h2>' +

</span><span class="cx" style="display: block; padding: 0 10px">                        '<table class="wp-help-single">' +

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -413,7 +413,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">-        // Register buttons

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Register buttons.

</ins><span class="cx" style="display: block; padding: 0 10px">         editor.addButton( 'wp_more', {

</span><span class="cx" style="display: block; padding: 0 10px">                tooltip: 'Insert Read More tag',

</span><span class="cx" style="display: block; padding: 0 10px">                onclick: function() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -439,7 +439,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                stateSelector: 'code'

</span><span class="cx" style="display: block; padding: 0 10px">        });

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Insert->Add Media

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Insert->Add Media.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( wp && wp.media && wp.media.editor ) {

</span><span class="cx" style="display: block; padding: 0 10px">                editor.addButton( 'wp_add_media', {

</span><span class="cx" style="display: block; padding: 0 10px">                        tooltip: 'Add Media',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -455,7 +455,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                });

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Insert "Read More..."

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Insert "Read More...".

</ins><span class="cx" style="display: block; padding: 0 10px">         editor.addMenuItem( 'wp_more', {

</span><span class="cx" style="display: block; padding: 0 10px">                text: 'Insert Read More tag',

</span><span class="cx" style="display: block; padding: 0 10px">                icon: 'wp_more',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -465,7 +465,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">-        // Insert "Next Page"

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Insert "Next Page".

</ins><span class="cx" style="display: block; padding: 0 10px">         editor.addMenuItem( 'wp_page', {

</span><span class="cx" style="display: block; padding: 0 10px">                text: 'Page break',

</span><span class="cx" style="display: block; padding: 0 10px">                icon: 'wp_page',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -496,7 +496,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        editor.on( 'init', function() {

</span><span class="cx" style="display: block; padding: 0 10px">                var env = tinymce.Env,

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        bodyClass = ['mceContentBody'], // back-compat for themes that use this in editor-style.css...

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 bodyClass = ['mceContentBody'], // Back-compat for themes that use this in editor-style.css...

</ins><span class="cx" style="display: block; padding: 0 10px">                         doc = editor.getDoc(),

</span><span class="cx" style="display: block; padding: 0 10px">                        dom = editor.dom;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -531,7 +531,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                });

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Remove invalid parent paragraphs when inserting HTML

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Remove invalid parent paragraphs when inserting HTML.

</ins><span class="cx" style="display: block; padding: 0 10px">                 editor.on( 'BeforeSetContent', function( event ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( event.content ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                event.content = event.content.replace( /<p>\s*<(p|div|ul|ol|dl|table|blockquote|h[1-6]|fieldset|pre)( [^>]*)?>/gi, '<$1$2>' )

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -554,21 +554,21 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( editor.getParam( 'wp_paste_filters', true ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        editor.on( 'PastePreProcess', function( event ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Remove trailing <br> added by WebKit browsers to the clipboard

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Remove trailing   added by WebKit browsers to the clipboard.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 event.content = event.content.replace( /<br class="?Apple-interchange-newline"?>/gi, '' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // In WebKit this is handled by removeWebKitStyles()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // In WebKit this is handled by removeWebKitStyles().

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( ! tinymce.Env.webkit ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Remove all inline styles

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Remove all inline styles.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         event.content = event.content.replace( /(<[^>]+) style="[^"]*"([^>]*>)/gi, '$1$2' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Put back the internal styles

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Put back the internal styles.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         event.content = event.content.replace(/(<[^>]+) data-mce-style=([^>]+>)/gi, '$1 style=$2' );

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px">                        });

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        editor.on( 'PastePostProcess', function( event ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Remove empty paragraphs

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Remove empty paragraphs.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 editor.$( 'p', event.node ).each( function( i, node ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        if ( dom.isEmpty( node ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                dom.remove( node );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -585,7 +585,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        });

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        editor.on( 'SaveContent', function( event ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If editor is hidden, we just want the textarea's value to be saved

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If editor is hidden, we just want the textarea's value to be saved.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! editor.inline && editor.isHidden() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        event.content = event.element.value;

</span><span class="cx" style="display: block; padding: 0 10px">                        return;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -700,7 +700,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                wpTooltips = {};

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // For MacOS: ctrl = \u2303, cmd = \u2318, alt = \u2325

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // For MacOS: ctrl = \u2303, cmd = \u2318, alt = \u2325.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( tinymce.Env.mac ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        access = '\u2303\u2325';

</span><span class="cx" style="display: block; padding: 0 10px">                        meta = '\u2318';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -761,7 +761,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function addShortcutsToListbox() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // listbox for the "blocks" drop-down

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // listbox for the "blocks" drop-down.

</ins><span class="cx" style="display: block; padding: 0 10px">                 each( editor.theme.panel.find( 'listbox' ), function( listbox ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( listbox && listbox.settings.text === 'Paragraph' ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                each( listbox.settings.values, function( item ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1118,9 +1118,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        event.type === 'resize' ||

</span><span class="cx" style="display: block; padding: 0 10px">                                        event.type === 'scroll'

</span><span class="cx" style="display: block; padding: 0 10px">                                ) && ! activeToolbar.blockHide ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Showing a tooltip may trigger a `resize` event in Chromium browsers.

-                                       // That results in a flicketing inline menu; tooltips are shown on hovering over a button,

-                                       // which then hides the toolbar on `resize`, then it repeats as soon as the toolbar is shown again.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 /*

+                                        * Showing a tooltip may trigger a `resize` event in Chromium browsers.

+                                        * That results in a flicketing inline menu; tooltips are shown on hovering over a button,

+                                        * which then hides the toolbar on `resize`, then it repeats as soon as the toolbar is shown again.

+                                        */

</ins><span class="cx" style="display: block; padding: 0 10px">                                         if ( event.type === 'resize' || event.type === 'resizewindow' ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                win = editor.getWin();

</span><span class="cx" style="display: block; padding: 0 10px">                                                size = win.innerHeight + win.innerWidth;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1187,7 +1189,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function noop() {}

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Expose some functions (back-compat)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Expose some functions (back-compat).

</ins><span class="cx" style="display: block; padding: 0 10px">         return {

</span><span class="cx" style="display: block; padding: 0 10px">                _showButtons: noop,

</span><span class="cx" style="display: block; padding: 0 10px">                _hideButtons: noop,

</span></span></pre></div>

<a id="trunksrcjs_enqueuesvendortinymcepluginswpautoresizepluginjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/vendor/tinymce/plugins/wpautoresize/plugin.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/vendor/tinymce/plugins/wpautoresize/plugin.js      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/vendor/tinymce/plugins/wpautoresize/plugin.js        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -61,13 +61,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! body || ( e && e.type === 'setcontent' && e.initial ) || isFullscreen() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( body && docElm ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                body.style.overflowY = 'auto';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                docElm.style.overflowY = 'auto'; // Old IE

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         docElm.style.overflowY = 'auto'; // Old IE.

</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;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Calculate outer height of the body element using CSS styles

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Calculate outer height of the body element using CSS styles.

</ins><span class="cx" style="display: block; padding: 0 10px">                 marginTop = editor.dom.getStyle( body, 'margin-top', true );

</span><span class="cx" style="display: block; padding: 0 10px">                marginBottom = editor.dom.getStyle( body, 'margin-bottom', true );

</span><span class="cx" style="display: block; padding: 0 10px">                paddingTop = editor.dom.getStyle( body, 'padding-top', true );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,36 +83,36 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        myHeight = docElm.offsetHeight;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make sure we have a valid height

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure we have a valid height.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( isNaN( myHeight ) || myHeight <= 0 ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Get height differently depending on the browser used

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Get height differently depending on the browser used.

</ins><span class="cx" style="display: block; padding: 0 10px">                         myHeight = tinymce.Env.ie ? body.scrollHeight : ( tinymce.Env.webkit && body.clientHeight === 0 ? 0 : body.offsetHeight );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Don't make it smaller than the minimum height

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Don't make it smaller than the minimum height.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( myHeight > settings.autoresize_min_height ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        resizeHeight = myHeight;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If a maximum height has been defined don't exceed this height

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If a maximum height has been defined don't exceed this height.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( settings.autoresize_max_height && myHeight > settings.autoresize_max_height ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        resizeHeight = settings.autoresize_max_height;

</span><span class="cx" style="display: block; padding: 0 10px">                        body.style.overflowY = 'auto';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        docElm.style.overflowY = 'auto'; // Old IE

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 docElm.style.overflowY = 'auto'; // Old IE.

</ins><span class="cx" style="display: block; padding: 0 10px">                 } else {

</span><span class="cx" style="display: block; padding: 0 10px">                        body.style.overflowY = 'hidden';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        docElm.style.overflowY = 'hidden'; // Old IE

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 docElm.style.overflowY = 'hidden'; // Old IE.

</ins><span class="cx" style="display: block; padding: 0 10px">                         body.scrollTop = 0;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Resize content element

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Resize content element.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if (resizeHeight !== oldSize) {

</span><span class="cx" style="display: block; padding: 0 10px">                        deltaSize = resizeHeight - oldSize;

</span><span class="cx" style="display: block; padding: 0 10px">                        DOM.setStyle( editor.iframeElement, 'height', resizeHeight + 'px' );

</span><span class="cx" style="display: block; padding: 0 10px">                        oldSize = resizeHeight;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // WebKit doesn't decrease the size of the body element until the iframe gets resized

-                       // So we need to continue to resize the iframe down until the size gets fixed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // WebKit doesn't decrease the size of the body element until the iframe gets resized.

+                       // So we need to continue to resize the iframe down until the size gets fixed.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( tinymce.isWebKit && deltaSize < 0 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                resize( e );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -137,10 +137,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }, interval );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Define minimum height

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Define minimum height.

</ins><span class="cx" style="display: block; padding: 0 10px">         settings.autoresize_min_height = parseInt(editor.getParam( 'autoresize_min_height', editor.getElement().offsetHeight), 10 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Define maximum height

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Define maximum height.

</ins><span class="cx" style="display: block; padding: 0 10px">         settings.autoresize_max_height = parseInt(editor.getParam( 'autoresize_max_height', 0), 10 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function on() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -147,7 +147,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! editor.dom.hasClass( editor.getBody(), 'wp-autoresize' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        isActive = true;

</span><span class="cx" style="display: block; padding: 0 10px">                        editor.dom.addClass( editor.getBody(), 'wp-autoresize' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Add appropriate listeners for resizing the content area

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Add appropriate listeners for resizing the content area.

</ins><span class="cx" style="display: block; padding: 0 10px">                         editor.on( 'nodechange setcontent keyup FullscreenStateChanged', resize );

</span><span class="cx" style="display: block; padding: 0 10px">                        resize();

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -156,7 +156,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function off() {

</span><span class="cx" style="display: block; padding: 0 10px">                var doc;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Don't turn off if the setting is 'on'

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Don't turn off if the setting is 'on'.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! settings.wp_autoresize_on ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        isActive = false;

</span><span class="cx" style="display: block; padding: 0 10px">                        doc = editor.getDoc();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -163,13 +163,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        editor.dom.removeClass( editor.getBody(), 'wp-autoresize' );

</span><span class="cx" style="display: block; padding: 0 10px">                        editor.off( 'nodechange setcontent keyup FullscreenStateChanged', resize );

</span><span class="cx" style="display: block; padding: 0 10px">                        doc.body.style.overflowY = 'auto';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        doc.documentElement.style.overflowY = 'auto'; // Old IE

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 doc.documentElement.style.overflowY = 'auto'; // Old IE.

</ins><span class="cx" style="display: block; padding: 0 10px">                         oldSize = 0;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( settings.wp_autoresize_on ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Turn resizing on when the editor loads

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Turn resizing on when the editor loads.

</ins><span class="cx" style="display: block; padding: 0 10px">                 isActive = true;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                editor.on( 'init', function() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -184,9 +184,9 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( editor.getParam( 'autoresize_on_init', true ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        editor.on( 'init', function() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Hit it 10 times in 200 ms intervals

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Hit it 10 times in 200 ms intervals.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 wait( 10, 200, function() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Hit it 5 times in 1 sec intervals

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Hit it 5 times in 1 sec intervals.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         wait( 5, 1000 );

</span><span class="cx" style="display: block; padding: 0 10px">                                });

</span><span class="cx" style="display: block; padding: 0 10px">                        });

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -193,15 +193,15 @@

</span><span class="cx" style="display: 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">-        // Reset the stored size

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Reset the stored size.

</ins><span class="cx" style="display: block; padding: 0 10px">         editor.on( 'show', function() {

</span><span class="cx" style="display: block; padding: 0 10px">                oldSize = 0;

</span><span class="cx" style="display: block; padding: 0 10px">        });

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Register the command

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Register the command.

</ins><span class="cx" style="display: block; padding: 0 10px">         editor.addCommand( 'wpAutoResize', resize );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // On/off

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // On/off.

</ins><span class="cx" style="display: block; padding: 0 10px">         editor.addCommand( 'wpAutoResizeOn', on );

</span><span class="cx" style="display: block; padding: 0 10px">        editor.addCommand( 'wpAutoResizeOff', off );

</span><span class="cx" style="display: block; padding: 0 10px"> });

</span></span></pre></div>

<a id="trunksrcjs_enqueuesvendortinymcepluginswpdialogspluginjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/vendor/tinymce/plugins/wpdialogs/plugin.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/vendor/tinymce/plugins/wpdialogs/plugin.js 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/vendor/tinymce/plugins/wpdialogs/plugin.js   2020-01-29 00:43:23 UTC (rev 47122)

</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">                if ( typeof jQuery === 'undefined' || ! jQuery.wp || ! jQuery.wp.wpdialog ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // wpdialog.js is not loaded

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // wpdialog.js is not loaded.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( window.console && window.console.error ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                window.console.error('wpdialog.js is not loaded. Please set "wpdialogs" as dependency for your script when calling wp_enqueue_script(). You may also want to enqueue the "wp-jquery-ui-dialog" stylesheet.');

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,7 +54,7 @@

<span class="cx" style="display: block; padding: 0 10px">                // Store selection. Takes a snapshot in the FocusManager of the selection before focus is moved to the dialog.

</span><span class="cx" style="display: block; padding: 0 10px">                editor.nodeChanged();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Create the dialog if necessary

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create the dialog if necessary.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! $element.data('wpdialog') ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $element.wpdialog({

</span><span class="cx" style="display: block; padding: 0 10px">                                title: args.title,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -85,7 +85,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"> tinymce.PluginManager.add( 'wpdialogs', function( editor ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Replace window manager

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Replace window manager.

</ins><span class="cx" style="display: block; padding: 0 10px">         editor.on( 'init', function() {

</span><span class="cx" style="display: block; padding: 0 10px">                editor.windowManager = new tinymce.WPWindowManager( editor );

</span><span class="cx" style="display: block; padding: 0 10px">        });

</span></span></pre></div>

<a id="trunksrcjs_enqueuesvendortinymcepluginswpeditimagepluginjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/vendor/tinymce/plugins/wpeditimage/plugin.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/vendor/tinymce/plugins/wpeditimage/plugin.js       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/vendor/tinymce/plugins/wpeditimage/plugin.js 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,7 +18,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        } );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        editor.addButton( 'wp_img_edit', {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                tooltip: 'Edit|button', // '|button' is not displayed, only used for context

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         tooltip: 'Edit|button', // '|button' is not displayed, only used for context.

</ins><span class="cx" style="display: block; padding: 0 10px">                 icon: 'dashicon dashicons-edit',

</span><span class="cx" style="display: block; padding: 0 10px">                onclick: function() {

</span><span class="cx" style="display: block; padding: 0 10px">                        editImage( editor.selection.getNode() );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -146,7 +146,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                caption = trim( img[2] );

</span><span class="cx" style="display: block; padding: 0 10px">                                img = trim( img[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">-                                // old captions shortcode style

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Old captions shortcode style.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 caption = trim( b ).replace( /caption=['"]/, '' ).replace( /['"]$/, '' );

</span><span class="cx" style="display: block; padding: 0 10px">                                img = c;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -214,11 +214,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                caption = caption.replace( /\r\n|\r/g, '\n' ).replace( /<[a-zA-Z0-9]+( [^<>]+)?>/g, function( a ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // no line breaks inside HTML tags

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // No line breaks inside HTML tags.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         return a.replace( /[\r\n\t]+/, ' ' );

</span><span class="cx" style="display: block; padding: 0 10px">                                });

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // convert remaining line breaks to <br>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Convert remaining line breaks to  .

</ins><span class="cx" style="display: block; padding: 0 10px">                                 caption = caption.replace( /\s*\n\s*/g, '<br />' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                return '[caption id="' + id + '" align="' + align + '" width="' + width + '"' + classes + ']' + c + ' ' + caption + '[/caption]';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -225,7 +225,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        });

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( out.indexOf('[caption') === -1 ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // the caption html seems broken, try to find the image that may be wrapped in a link

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // The caption html seems broken, try to find the image that may be wrapped in a link

</ins><span class="cx" style="display: block; padding: 0 10px">                                 // and may be followed by  with the caption text.

</span><span class="cx" style="display: block; padding: 0 10px">                                out = dl.replace( /[\s\S]*?((?:<a [^>]+>)?<img [^>]+>(?:<\/a>)?)(<p>[\s\S]*<\/p>)?[\s\S]*/gi, '<p>$1</p>$2' );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -240,7 +240,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        dom = editor.dom,

</span><span class="cx" style="display: block; padding: 0 10px">                        isIntRegExp = /^\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">-                // default attributes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Default attributes.

</ins><span class="cx" style="display: block; padding: 0 10px">                 metadata = {

</span><span class="cx" style="display: block; padding: 0 10px">                        attachment_id: false,

</span><span class="cx" style="display: block; padding: 0 10px">                        size: 'custom',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -292,7 +292,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                metadata.extraClasses = extraClasses.join( ' ' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Extract caption

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Extract caption.

</ins><span class="cx" style="display: block; padding: 0 10px">                 captionBlock = dom.getParents( imageNode, '.wp-caption' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( captionBlock.length ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -318,7 +318,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Extract linkTo

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Extract linkTo.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( imageNode.parentNode && imageNode.parentNode.nodeName === 'A' ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        link = imageNode.parentNode;

</span><span class="cx" style="display: block; padding: 0 10px">                        metadata.linkUrl = dom.getAttrib( link, 'href' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -334,7 +334,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                return node && !! ( node.textContent || node.innerText ).replace( /\ufeff/g, '' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Verify HTML in captions

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Verify HTML in captions.

</ins><span class="cx" style="display: block; padding: 0 10px">         function verifyHTML( caption ) {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! caption || ( caption.indexOf( '<' ) === -1 && caption.indexOf( '>' ) === -1 ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return caption;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -404,7 +404,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 ( imageNode.parentNode && imageNode.parentNode.nodeName === 'A' && ! hasTextContent( imageNode.parentNode ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Update or remove an existing link wrapped around the image

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Update or remove an existing link wrapped around the image.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( imageData.linkUrl ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                dom.setAttribs( imageNode.parentNode, linkAttrs );

</span><span class="cx" style="display: block; padding: 0 10px">                        } else {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -413,11 +413,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                } else if ( imageData.linkUrl ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( linkNode = dom.getParent( imageNode, 'a' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                // The image is inside a link together with other nodes,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // or is nested in another node, move it out

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // or is nested in another node, move it out.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 dom.insertAfter( imageNode, linkNode );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Add link wrapped around the image

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Add link wrapped around the image.

</ins><span class="cx" style="display: block; padding: 0 10px">                         linkNode = dom.create( 'a', linkAttrs );

</span><span class="cx" style="display: block; padding: 0 10px">                        imageNode.parentNode.insertBefore( linkNode, imageNode );

</span><span class="cx" style="display: block; padding: 0 10px">                        linkNode.appendChild( imageNode );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -467,7 +467,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        } else {

</span><span class="cx" style="display: block; padding: 0 10px">                                id = id ? 'id="'+ id +'" ' : '';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // should create a new function for generating the caption markup

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Should create a new function for generating the caption markup.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 html =  '<dl ' + id + 'class="' + className +'" style="width: '+ width +'px">' +

</span><span class="cx" style="display: block; padding: 0 10px">                                        '<dt class="wp-caption-dt"></dt><dd class="wp-caption-dd">'+ imageData.caption +'</dd></dl>';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -486,7 +486,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">                } else if ( captionNode ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Remove the caption wrapper and place the image in new paragraph

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Remove the caption wrapper and place the image in new paragraph.

</ins><span class="cx" style="display: block; padding: 0 10px">                         parent = dom.create( 'p' );

</span><span class="cx" style="display: block; padding: 0 10px">                        captionNode.parentNode.insertBefore( parent, captionNode );

</span><span class="cx" style="display: block; padding: 0 10px">                        parent.appendChild( node );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -530,7 +530,7 @@

<span class="cx" style="display: block; padding: 0 10px">                // Mark the image node so we can select it later.

</span><span class="cx" style="display: block; padding: 0 10px">                editor.$( img ).attr( 'data-wp-editing', 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">-                // Manipulate the metadata by reference that is fed into the PostImage model used in the media modal

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Manipulate the metadata by reference that is fed into the PostImage model used in the media modal.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp.media.events.trigger( 'editor:image-edit', {

</span><span class="cx" style="display: block; padding: 0 10px">                        editor: editor,

</span><span class="cx" style="display: block; padding: 0 10px">                        metadata: metadata,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -558,9 +558,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        editor.focus();

</span><span class="cx" style="display: block; padding: 0 10px">                        frame.detach();

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // `close` fires first...

-                       // To be able to update the image node, we need to find it here,

-                       // and use it in the callback.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 /*

+                        * `close` fires first...

+                        * To be able to update the image node, we need to find it here,

+                        * and use it in the callback.

+                        */

</ins><span class="cx" style="display: block; padding: 0 10px">                         imageNode = editor.$( 'img[data-wp-editing]' )

</span><span class="cx" style="display: block; padding: 0 10px">                        imageNode.removeAttr( 'data-wp-editing' );

</span><span class="cx" style="display: block; padding: 0 10px">                });

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -600,12 +602,12 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                dom.addClass( editor.getBody(), captionClass );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Prevent IE11 from making dl.wp-caption resizable

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Prevent IE11 from making dl.wp-caption resizable.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( tinymce.Env.ie && tinymce.Env.ie > 10 ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // The 'mscontrolselect' event is supported only in IE11+

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // The 'mscontrolselect' event is supported only in IE11+.

</ins><span class="cx" style="display: block; padding: 0 10px">                         dom.bind( editor.getBody(), 'mscontrolselect', function( event ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( event.target.nodeName === 'IMG' && dom.getParent( event.target, '.wp-caption' ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Hide the thick border with resize handles around dl.wp-caption

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Hide the thick border with resize handles around dl.wp-caption.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         editor.getBody().focus(); // :(

</span><span class="cx" style="display: block; padding: 0 10px">                                } else if ( event.target.nodeName === 'DL' && dom.hasClass( event.target, 'wp-caption' ) ) {

<span class="cx" style="display: block; padding: 0 10px">                                        // Trigger the thick border with resize handles...

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -688,25 +690,31 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( cmd === 'mceInsertContent' ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        if ( pasteInCaption ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                pasteInCaption = false;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                // We are in the caption element, and in 'paste' context,

-                                               // and the pasted HTML was cleaned up on 'pastePostProcess' above.

-                                               // Let it be pasted in the caption.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         /*

+                                                * We are in the caption element, and in 'paste' context,

+                                                * and the pasted HTML was cleaned up on 'pastePostProcess' above.

+                                                * Let it be pasted in the caption.

+                                                */

</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"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // The paste is somewhere else in the caption DL element.

-                                       // Prevent pasting in there as it will break the caption.

-                                       // Make new paragraph under the caption DL and move the caret there.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 /*

+                                        * The paste is somewhere else in the caption DL element.

+                                        * Prevent pasting in there as it will break the caption.

+                                        * Make new paragraph under the caption DL and move the caret there.

+                                        */

</ins><span class="cx" style="display: block; padding: 0 10px">                                         p = dom.create( 'p' );

</span><span class="cx" style="display: block; padding: 0 10px">                                        dom.insertAfter( p, captionParent );

</span><span class="cx" style="display: block; padding: 0 10px">                                        editor.selection.setCursorLocation( p, 0 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // If the image is selected and the user pastes "over" it,

-                                       // replace both the image and the caption elements with the pasted content.

-                                       // This matches the behavior when pasting over non-caption images.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 /*

+                                        * If the image is selected and the user pastes "over" it,

+                                        * replace both the image and the caption elements with the pasted content.

+                                        * This matches the behavior when pasting over non-caption images.

+                                        */

</ins><span class="cx" style="display: block; padding: 0 10px">                                         if ( node.nodeName === 'IMG' ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        editor.$( captionParent ).remove();

-                    }

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         editor.$( captionParent ).remove();

+                                       }

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                        editor.nodeChanged();

</span><span class="cx" style="display: block; padding: 0 10px">                                } else {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -759,7 +767,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        VK = tinymce.util.VK;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( keyCode === VK.ENTER ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // When pressing Enter inside a caption move the caret to a new parapraph under it

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // When pressing Enter inside a caption move the caret to a new parapraph under it.

</ins><span class="cx" style="display: block; padding: 0 10px">                         node = selection.getNode();

</span><span class="cx" style="display: block; padding: 0 10px">                        wrap = dom.getParent( node, 'div.mceTemp' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -802,9 +810,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        });

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // After undo/redo FF seems to set the image height very slowly when it is set to 'auto' in the CSS.

-       // This causes image.getBoundingClientRect() to return wrong values and the resize handles are shown in wrong places.

-       // Collapse the selection to remove the resize handles.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*

+        * After undo/redo FF seems to set the image height very slowly when it is set to 'auto' in the CSS.

+        * This causes image.getBoundingClientRect() to return wrong values and the resize handles are shown in wrong places.

+        * Collapse the selection to remove the resize handles.

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( tinymce.Env.gecko ) {

</span><span class="cx" style="display: block; padding: 0 10px">                editor.on( 'undo redo', function() {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( editor.selection.getNode().nodeName === 'IMG' ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -878,7 +888,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">-        // Add to editor.wp

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Add to editor.wp.

</ins><span class="cx" style="display: block; padding: 0 10px">         editor.wp = editor.wp || {};

</span><span class="cx" style="display: block; padding: 0 10px">        editor.wp.isPlaceholder = isPlaceholder;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunksrcjs_enqueuesvendortinymcepluginswpemojipluginjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/vendor/tinymce/plugins/wpemoji/plugin.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/vendor/tinymce/plugins/wpemoji/plugin.js   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/vendor/tinymce/plugins/wpemoji/plugin.js     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,9 +56,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( isWin8 ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Windows 8+ emoji can be "typed" with the onscreen keyboard.

-                       // That triggers the normal keyboard events, but not the 'input' event.

-                       // Thankfully it sets keyCode 231 when the onscreen keyboard inserts any emoji.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 /*

+                        * Windows 8+ emoji can be "typed" with the onscreen keyboard.

+                        * That triggers the normal keyboard events, but not the 'input' event.

+                        * Thankfully it sets keyCode 231 when the onscreen keyboard inserts any emoji.

+                        */

</ins><span class="cx" style="display: block; padding: 0 10px">                         editor.on( 'keyup', function( event ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( event.keyCode === 231 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        parseNode( editor.selection.getNode() );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,9 +67,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px">                        } );

</span><span class="cx" style="display: block; padding: 0 10px">                } else if ( ! isWin ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // In MacOS inserting emoji doesn't trigger the stanradr keyboard events.

-                       // Thankfully it triggers the 'input' event.

-                       // This works in Android and iOS as well.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 /*

+                        * In MacOS inserting emoji doesn't trigger the stanradr keyboard events.

+                        * Thankfully it triggers the 'input' event.

+                        * This works in Android and iOS as well.

+                        */

</ins><span class="cx" style="display: block; padding: 0 10px">                         editor.on( 'keydown keyup', function( event ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                typing = ( event.type === 'keydown' );

</span><span class="cx" style="display: block; padding: 0 10px">                        } );

</span></span></pre></div>

<a id="trunksrcjs_enqueuesvendortinymcepluginswpgallerypluginjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/vendor/tinymce/plugins/wpgallery/plugin.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/vendor/tinymce/plugins/wpgallery/plugin.js 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/vendor/tinymce/plugins/wpgallery/plugin.js   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,7 +57,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Register the command so that it can be invoked by using tinyMCE.activeEditor.execCommand('...');

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Register the command so that it can be invoked by using tinyMCE.activeEditor.execCommand('...').

</ins><span class="cx" style="display: block; padding: 0 10px">         editor.addCommand( 'WP_Gallery', function() {

</span><span class="cx" style="display: block; padding: 0 10px">                editMedia( editor.selection.getNode() );

</span><span class="cx" style="display: block; padding: 0 10px">        });

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,7 +71,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( node.nodeName === 'IMG' && dom.getAttrib( node, 'data-wp-media' ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Don't trigger on right-click

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Don't trigger on right-click.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( event.button !== 2 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( dom.hasClass( node, 'wp-media-selected' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        editMedia( node );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -85,7 +85,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">-        // Display gallery, audio or video instead of img in the element path

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Display gallery, audio or video instead of img in the element path.

</ins><span class="cx" style="display: block; padding: 0 10px">         editor.on( 'ResolveName', function( event ) {

</span><span class="cx" style="display: block; padding: 0 10px">                var dom = editor.dom,

</span><span class="cx" style="display: block; padding: 0 10px">                        node = event.target;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -98,7 +98,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        });

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        editor.on( 'BeforeSetContent', function( event ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // 'wpview' handles the gallery shortcode when present

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // 'wpview' handles the gallery shortcode when present.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! editor.plugins.wpview || typeof wp === 'undefined' || ! wp.mce ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        event.content = replaceGalleryShortcodes( event.content );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span></span></pre></div>

<a id="trunksrcjs_enqueuesvendortinymcepluginswplinkpluginjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/vendor/tinymce/plugins/wplink/plugin.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/vendor/tinymce/plugins/wplink/plugin.js    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/vendor/tinymce/plugins/wplink/plugin.js      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,9 +37,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        url = this.url;

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // If the URL is longer that 40 chars, concatenate the beginning (after the domain) and ending with ...

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // If the URL is longer that 40 chars, concatenate the beginning (after the domain) and ending with '...'.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( url.length > 40 && ( index = url.indexOf( '/' ) ) !== -1 && ( lastIndex = url.lastIndexOf( '/' ) ) !== -1 && lastIndex !== index ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // If the beginning + ending are shorter that 40 chars, show more of the ending

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // If the beginning + ending are shorter that 40 chars, show more of the ending.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         if ( index + url.length - lastIndex < 40 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                lastIndex = -( 40 - ( index + 1 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -297,10 +297,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        editor.execCommand( 'wp_link_cancel' );

</span><span class="cx" style="display: block; padding: 0 10px">                } );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // WP default shortcuts

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // WP default shortcuts.

</ins><span class="cx" style="display: block; padding: 0 10px">                 editor.addShortcut( 'access+a', '', 'WP_Link' );

</span><span class="cx" style="display: block; padding: 0 10px">                editor.addShortcut( 'access+s', '', 'wp_unlink' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // The "de-facto standard" shortcut, see #27305

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // The "de-facto standard" shortcut, see #27305.

</ins><span class="cx" style="display: block; padding: 0 10px">                 editor.addShortcut( 'meta+k', '', 'WP_Link' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                editor.addButton( 'link', {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -565,7 +565,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                } );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                editor.addButton( 'wp_link_edit', {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        tooltip: 'Edit|button', // '|button' is not displayed, only used for context

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 tooltip: 'Edit|button', // '|button' is not displayed, only used for context.

</ins><span class="cx" style="display: block; padding: 0 10px">                         icon: 'dashicon dashicons-edit',

</span><span class="cx" style="display: block; padding: 0 10px">                        cmd: 'WP_Link'

</span><span class="cx" style="display: block; padding: 0 10px">                } );

</span></span></pre></div>

<a id="trunksrcjs_enqueuesvendortinymcepluginswptextpatternpluginjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/vendor/tinymce/plugins/wptextpattern/plugin.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/vendor/tinymce/plugins/wptextpattern/plugin.js     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/vendor/tinymce/plugins/wptextpattern/plugin.js       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -149,9 +149,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                var before = string.charAt( startOffset - 1 );

</span><span class="cx" style="display: block; padding: 0 10px">                                var after = string.charAt( startOffset + p.delimiter.length );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // test*test* => format applied

-                               // test *test* => applied

-                               // test* test* => not applied

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // test*test*  => format applied.

+                               // test *test* => applied.

+                               // test* test* => not applied.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( startOffset && /\S/.test( before ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        if ( /\s/.test( after ) || before === delimiterFirstChar ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                return;

</span></span></pre></div>

<a id="trunksrcjs_enqueuesvendortinymcepluginswpviewpluginjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/vendor/tinymce/plugins/wpview/plugin.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/vendor/tinymce/plugins/wpview/plugin.js    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/vendor/tinymce/plugins/wpview/plugin.js      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,7 +52,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                var className = editor.getBody().className;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                editor.$( 'iframe[class="wpview-sandbox"]' ).each( function( i, iframe ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Make sure it is a local iframe

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Make sure it is a local iframe.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         // jshint scripturl: true

</span><span class="cx" style="display: block; padding: 0 10px">                                        if ( ! iframe.src || iframe.src === 'javascript:""' ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                try {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -79,11 +79,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                node = editor.selection.getNode();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( node && node !== editor.getBody() && /^\s*https?:\/\/\S+\s*$/i.test( event.content ) ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // When a url is pasted or inserted, only try to embed it when it is in an empty paragrapgh.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // When a url is pasted or inserted, only try to embed it when it is in an empty paragraph.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         node = editor.dom.getParent( node, 'p' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                        if ( node && /^[\s\uFEFF\u00A0]*$/.test( editor.$( node ).text() || '' ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                // Make sure there are no empty inline elements in the <p>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         // Make sure there are no empty inline elements in the .

</ins><span class="cx" style="display: block; padding: 0 10px">                                                 node.innerHTML = '';

</span><span class="cx" style="display: block; padding: 0 10px">                                        } else {

</span><span class="cx" style="display: block; padding: 0 10px">                                                return;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -178,7 +178,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">                editor.addButton( 'wp_view_edit', {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        tooltip: 'Edit|button', // '|button' is not displayed, only used for context

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 tooltip: 'Edit|button', // '|button' is not displayed, only used for context.

</ins><span class="cx" style="display: block; padding: 0 10px">                         icon: 'dashicon dashicons-edit',

</span><span class="cx" style="display: block; padding: 0 10px">                        onclick: function() {

</span><span class="cx" style="display: block; padding: 0 10px">                                var node = editor.selection.getNode();

</span></span></pre></div>

<a id="trunksrcjs_enqueuesvendortinymcewptinymcephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/vendor/tinymce/wp-tinymce.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/vendor/tinymce/wp-tinymce.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/vendor/tinymce/wp-tinymce.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,10 +26,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">        return @file_get_contents( $path );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$expires_offset = 31536000; // 1 year

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$expires_offset = 31536000; // 1 year.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> header( 'Content-Type: application/javascript; charset=UTF-8' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-header( 'Vary: Accept-Encoding' ); // Handle proxies

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+header( 'Vary: Accept-Encoding' ); // Handle proxies.

</ins><span class="cx" style="display: block; padding: 0 10px"> header( 'Expires: ' . gmdate( 'D, d M Y H:i:s', time() + $expires_offset ) . ' GMT' );

</span><span class="cx" style="display: block; padding: 0 10px"> header( "Cache-Control: public, max-age=$expires_offset" );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunksrcjs_enqueueswpapirequestjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/wp/api-request.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/wp/api-request.js  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/wp/api-request.js    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +8,7 @@

<span class="cx" style="display: block; padding: 0 10px">  * - Sends the REST API nonce as a request header.

<span class="cx" style="display: block; padding: 0 10px">  * - Allows specifying only an endpoint namespace/path instead of a full URL.

</span><span class="cx" style="display: block; padding: 0 10px">  *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since     4.9.0

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 4.9.0

</ins><span class="cx" style="display: block; padding: 0 10px">  * @output wp-includes/js/api-request.js

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,8 +42,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        apiRoot = wpApiSettings.root;

</span><span class="cx" style="display: block; padding: 0 10px">                        path = path.replace( /^\//, '' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // API root may already include query parameter prefix if site is

-                       // configured to use plain permalinks.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // API root may already include query parameter prefix

+                       // if site is configured to use plain permalinks.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( 'string' === typeof apiRoot && -1 !== apiRoot.indexOf( '?' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                path = path.replace( '?', '&' );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span></span></pre></div>

<a id="trunksrcjs_enqueueswpapijs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/wp/api.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/wp/api.js  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/wp/api.js    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,9 +107,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        minutesOffset = 0,

</span><span class="cx" style="display: block; padding: 0 10px">                        numericKeys = [ 1, 4, 5, 6, 7, 10, 11 ];

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // ES5 §15.9.4.2 states that the string should attempt to be parsed as a Date Time String Format string

-               // before falling back to any implementation-specific date parsing, so that’s what we do, even if native

-               // implementations could be faster.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /*

+                * ES5 §15.9.4.2 states that the string should attempt to be parsed as a Date Time String Format string

+                * before falling back to any implementation-specific date parsing, so that’s what we do, even if native

+                * implementations could be faster.

+                */

</ins><span class="cx" style="display: block; padding: 0 10px">                 //              1 YYYY                2 MM       3 DD           4 HH    5 mm       6 ss        7 msec        8 Z 9 ±    10 tzHH    11 tzmm

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ( struct = /^(\d{4}|[+\-]\d{6})(?:-(\d{2})(?:-(\d{2}))?)?(?:T(\d{2}):(\d{2})(?::(\d{2})(?:\.(\d{3}))?)?(?:(Z)|([+\-])(\d{2})(?::(\d{2}))?)?)?$/.exec( date ) ) ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -855,7 +857,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( _.isFunction( model.nonce ) && ! _.isEmpty( model.nonce() ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        beforeSend = options.beforeSend;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // @todo enable option for jsonp endpoints

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // @todo Enable option for jsonp endpoints.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         // options.dataType = 'jsonp';

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                                        // Include the nonce with requests.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1340,7 +1342,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        } );

</span><span class="cx" style="display: block; padding: 0 10px">                                } else {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // This is a model without a parent in its route

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // This is a model without a parent in its route.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         modelClassName = wp.api.utils.capitalizeAndCamelCaseDashes( routeName );

</span><span class="cx" style="display: block; padding: 0 10px">                                        modelClassName = mapping.models[ modelClassName ] || modelClassName;

</span><span class="cx" style="display: block; padding: 0 10px">                                        loadingObjects.models[ modelClassName ] = wp.api.WPApiBaseModel.extend( {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1514,7 +1516,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! initializedDeferreds[ attributes.apiRoot + attributes.versionString ] ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Look for an existing copy of this endpoint

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Look for an existing copy of this endpoint.

</ins><span class="cx" style="display: block; padding: 0 10px">                         endpoint = wp.api.endpoints.findWhere( { 'apiRoot': attributes.apiRoot, 'versionString': attributes.versionString } );

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! endpoint ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                endpoint = new Endpoint( attributes );

</span></span></pre></div>

<a id="trunksrcjs_enqueueswpautosavejs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/wp/autosave.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/wp/autosave.js     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/wp/autosave.js       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,7 +3,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"> /* global tinymce, wpCookies, autosaveL10n, switchEditors */

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Back-compat

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Back-compat.

</ins><span class="cx" style="display: block; padding: 0 10px"> window.autosave = function() {

</span><span class="cx" style="display: block; padding: 0 10px">        return true;

</span><span class="cx" style="display: block; padding: 0 10px"> };

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -209,7 +209,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                         */

</span><span class="cx" style="display: block; padding: 0 10px">                        function getStorage() {

</span><span class="cx" style="display: block; padding: 0 10px">                                var stored_obj = false;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Separate local storage containers for each blog_id

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Separate local storage containers for each blog_id.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( hasStorage && blog_id ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        stored_obj = sessionStorage.getItem( 'wp-autosave-' + blog_id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -314,7 +314,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        /**

<span class="cx" style="display: block; padding: 0 10px">                         * Saves post data for the current post.

</span><span class="cx" style="display: block; padding: 0 10px">                         *

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                         * Runs on a 15 sec. interval, saves when there are differences in the post title or content.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                  * Runs on a 15 seconds interval, saves when there are differences in the post title or content.

</ins><span class="cx" style="display: block; padding: 0 10px">                          * When the optional data is provided, updates the last saved post data.

</span><span class="cx" style="display: block; padding: 0 10px">                         *

</span><span class="cx" style="display: block; padding: 0 10px">                         * @since 3.9.0

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -378,9 +378,11 @@

<span class="cx" style="display: block; padding: 0 10px">                                // Check if the local post data is different than the loaded post data.

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( $( '#wp-content-wrap' ).hasClass( 'tmce-active' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // If TinyMCE loads first, check the post 1.5 sec. after it is ready.

-                                       // By this time the content has been loaded in the editor and 'saved' to the textarea.

-                                       // This prevents false positives.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 /*

+                                        * If TinyMCE loads first, check the post 1.5 seconds after it is ready.

+                                        * By this time the content has been loaded in the editor and 'saved' to the textarea.

+                                        * This prevents false positives.

+                                        */

</ins><span class="cx" style="display: block; padding: 0 10px">                                         $document.on( 'tinymce-editor-init.autosave', function() {

</span><span class="cx" style="display: block; padding: 0 10px">                                                window.setTimeout( function() {

</span><span class="cx" style="display: block; padding: 0 10px">                                                        checkPost();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -390,7 +392,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        checkPost();

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Save every 15 sec.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Save every 15 seconds.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 intervalTimer = window.setInterval( save, 15000 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                $( 'form#post' ).on( 'submit.autosave-local', function() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -456,7 +458,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( cookie === post_id + '-saved' ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        wpCookies.remove( 'wp-saving-post' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // The post was saved properly, remove old data and bail

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // The post was saved properly, remove old data and bail.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         setData( false );

</span><span class="cx" style="display: block; padding: 0 10px">                                        return;

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -519,7 +521,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                var editor;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( postData ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Set the last saved data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Set the last saved data.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         lastCompareString = getCompareString( postData );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                        if ( $( '#title' ).val() !== postData.post_title ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -534,7 +536,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                                        postData.content = switchEditors.wpautop( postData.content );

</span><span class="cx" style="display: block; padding: 0 10px">                                                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                // Make sure there's an undo level in the editor

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         // Make sure there's an undo level in the editor.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                 editor.undoManager.transact( function() {

</span><span class="cx" style="display: block; padding: 0 10px">                                                        editor.setContent( postData.content || '' );

</span><span class="cx" style="display: block; padding: 0 10px">                                                        editor.nodeChanged();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -541,7 +543,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                                });

</span><span class="cx" style="display: block; padding: 0 10px">                                        } else {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                // Make sure the Text editor is selected

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         // Make sure the Text editor is selected.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                 $( '#content-html' ).click();

</span><span class="cx" style="display: block; padding: 0 10px">                                                $( '#content' ).focus();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -558,9 +560,11 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        blog_id = typeof window.autosaveL10n !== 'undefined' && window.autosaveL10n.blog_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">-                        // Check if the browser supports sessionStorage and it's not disabled,

-                       // then initialize and run checkPost().

-                       // Don't run if the post type supports neither 'editor' (textarea#content) nor 'excerpt'.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 /*

+                        * Check if the browser supports sessionStorage and it's not disabled,

+                        * then initialize and run checkPost().

+                        * Don't run if the post type supports neither 'editor' (textarea#content) nor 'excerpt'.

+                        */

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( checkStorage() && blog_id && ( $('#content').length || $('#excerpt').length ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $document.ready( run );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -652,7 +656,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                enableButtons();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( data.success ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // No longer an auto-draft

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // No longer an auto-draft.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         $( '#auto_draft' ).val('');

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -698,7 +702,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        function save() {

</span><span class="cx" style="display: block; padding: 0 10px">                                var postData, compareString;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // window.autosave() used for back-compat

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // window.autosave() used for back-compat.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( isSuspended || _blockSave || ! window.autosave() ) {

</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">@@ -710,12 +714,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                postData = getPostData();

</span><span class="cx" style="display: block; padding: 0 10px">                                compareString = getCompareString( postData );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // First check

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // First check.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( typeof lastCompareString === 'undefined' ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        lastCompareString = initialCompareString;

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // No change

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // No change.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( compareString === lastCompareString ) {

</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">@@ -836,7 +840,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                }).ready( function() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Set the initial compare string in case TinyMCE is not used or not loaded first

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Set the initial compare string in case TinyMCE is not used or not loaded first.

</ins><span class="cx" style="display: block; padding: 0 10px">                         initialCompareString = getCompareString();

</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="trunksrcjs_enqueueswpcodeeditorjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/wp/code-editor.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/wp/code-editor.js  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/wp/code-editor.js    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -79,7 +79,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                options = $.extend( {}, options );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Note that rules must be sent in the "deprecated" lint.options property to prevent linter from complaining about unrecognized options. See <https://github.com/codemirror/CodeMirror/pull/4944>.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 /*

+                        * Note that rules must be sent in the "deprecated" lint.options property 

+                        * to prevent linter from complaining about unrecognized options.

+                        * See <https://github.com/codemirror/CodeMirror/pull/4944>.

+                        */

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( ! options.options ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                options.options = {};

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span></span></pre></div>

<a id="trunksrcjs_enqueueswpcustomheaderjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/wp/custom-header.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/wp/custom-header.js        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/wp/custom-header.js  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -79,7 +79,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                 * @return {boolean}

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                supportsVideo: function() {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Don't load video on small screens. @todo: consider bandwidth and other factors.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Don't load video on small screens. @todo Consider bandwidth and other factors.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( window.innerWidth < settings.minWidth || window.innerHeight < settings.minHeight ) {

</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="trunksrcjs_enqueueswpcustomizebasejs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/wp/customize/base.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/wp/customize/base.js       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/wp/customize/base.js 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,17 +25,21 @@

</span><span class="cx" style="display: block; padding: 0 10px">        inherits = function( parent, protoProps, staticProps ) {

</span><span class="cx" style="display: block; padding: 0 10px">                var child;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // The constructor function for the new subclass is either defined by you

-               // (the "constructor" property in your `extend` definition), or defaulted

-               // by us to simply call `super()`.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /*

+                * The constructor function for the new subclass is either defined by you

+                * (the "constructor" property in your `extend` definition), or defaulted

+                * by us to simply call `super()`.

+                */

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( protoProps && protoProps.hasOwnProperty( 'constructor' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        child = protoProps.constructor;

</span><span class="cx" style="display: block; padding: 0 10px">                } else {

</span><span class="cx" style="display: block; padding: 0 10px">                        child = function() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Storing the result `super()` before returning the value

-                               // prevents a bug in Opera where, if the constructor returns

-                               // a function, Opera will reject the return value in favor of

-                               // the original object. This causes all sorts of trouble.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         /*

+                                * Storing the result `super()` before returning the value

+                                * prevents a bug in Opera where, if the constructor returns

+                                * a function, Opera will reject the return value in favor of

+                                * the original object. This causes all sorts of trouble.

+                                */

</ins><span class="cx" style="display: block; padding: 0 10px">                                 var result = parent.apply( this, arguments );

</span><span class="cx" style="display: block; padding: 0 10px">                                return result;

</span><span class="cx" style="display: block; padding: 0 10px">                        };

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,8 +48,8 @@

<span class="cx" style="display: block; padding: 0 10px">                // Inherit class (static) properties from parent.

</span><span class="cx" style="display: block; padding: 0 10px">                $.extend( child, parent );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set the prototype chain to inherit from `parent`, without calling

-               // `parent`'s constructor function.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set the prototype chain to inherit from `parent`,

+               // without calling `parent`'s constructor function.

</ins><span class="cx" style="display: block; padding: 0 10px">                 ctor.prototype  = parent.prototype;

</span><span class="cx" style="display: block; padding: 0 10px">                child.prototype = new ctor();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -187,7 +191,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                 * @param {object} options

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                initialize: function( initial, options ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        this._value = initial; // @todo: potentially change this to a this.set() call.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 this._value = initial; // @todo Potentially change this to a this.set() call.

</ins><span class="cx" style="display: block; padding: 0 10px">                         this.callbacks = $.Callbacks();

</span><span class="cx" style="display: block; padding: 0 10px">                        this._dirty = false;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -496,7 +500,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                ids  = slice.call( arguments ),

</span><span class="cx" style="display: block; padding: 0 10px">                                dfd  = $.Deferred();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // If the last argument is a callback, bind it to .done()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // If the last argument is a callback, bind it to .done().

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( $.isFunction( ids[ ids.length - 1 ] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                dfd.done( ids.pop() );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -699,7 +703,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                return urlParser.protocol + '//' + urlParser.host.replace( /:(80|443)$/, '' );

</span><span class="cx" style="display: block; padding: 0 10px">                        });

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // first add with no value

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // First add with no value.

</ins><span class="cx" style="display: block; padding: 0 10px">                         this.add( 'targetWindow', null );

<span class="cx" style="display: block; padding: 0 10px">                        // This avoids SecurityErrors when setting a window object in x-origin iframe'd scenarios.

</span><span class="cx" style="display: block; padding: 0 10px">                        this.targetWindow.set = function( to ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -719,15 +723,17 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                return this;

</span><span class="cx" style="display: block; padding: 0 10px">                        };

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // now set it

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Now set it.

</ins><span class="cx" style="display: block; padding: 0 10px">                         this.targetWindow( params.targetWindow || defaultTarget );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Since we want jQuery to treat the receive function as unique

-                       // to this instance, we give the function a new guid.

-                       //

-                       // This will prevent every Messenger's receive function from being

-                       // unbound when calling $.off( 'message', this.receive );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 /*

+                        * Since we want jQuery to treat the receive function as unique

+                        * to this instance, we give the function a new guid.

+                        *

+                        * This will prevent every Messenger's receive function from being

+                        * unbound when calling $.off( 'message', this.receive );

+                        */

</ins><span class="cx" style="display: block; padding: 0 10px">                         this.receive = $.proxy( this.receive, this );

</span><span class="cx" style="display: block; padding: 0 10px">                        this.receive.guid = $.guid++;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunksrcjs_enqueueswpcustomizecontrolsjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/wp/customize/controls.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/wp/customize/controls.js   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/wp/customize/controls.js     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -578,7 +578,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        return deferred.promise();

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // A status would cause a revision to be made, and for this wp.customize.previewer.save() should be used. Status is also disallowed for revisions regardless.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // A status would cause a revision to be made, and for this wp.customize.previewer.save() should be used.

+               // Status is also disallowed for revisions regardless.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( submittedArgs.status ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return deferred.reject( { code: 'illegal_status_in_changeset_update' } ).promise();

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -772,13 +773,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        api.utils.areElementListsEqual = function ( listA, listB ) {

</span><span class="cx" style="display: block; padding: 0 10px">                var equal = (

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        listA.length === listB.length && // if lists are different lengths, then naturally they are not equal

-                       -1 === _.indexOf( _.map( // are there any false values in the list returned by map?

-                               _.zip( listA, listB ), // pair up each element between the two lists

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 listA.length === listB.length && // If lists are different lengths, then naturally they are not equal.

+                       -1 === _.indexOf( _.map(         // Are there any false values in the list returned by map?

+                               _.zip( listA, listB ),       // Pair up each element between the two lists.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 function ( pair ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        return $( pair[0] ).is( pair[1] ); // compare to see if each pair are equal

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 return $( pair[0] ).is( pair[1] ); // Compare to see if each pair is equal.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        ), false ) // check for presence of false in map's return value

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 ), false ) // Check for presence of false in map's return value.

</ins><span class="cx" style="display: block; padding: 0 10px">                 );

</span><span class="cx" style="display: block; padding: 0 10px">                return equal;

</span><span class="cx" style="display: block; padding: 0 10px">        };

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1128,7 +1129,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 ( ! $.contains( document, headContainer.get( 0 ) ) ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // If the element is not in the DOM, then jQuery.fn.slideUp() does nothing. In this case, a hard toggle is required instead.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // If the element is not in the DOM, then jQuery.fn.slideUp() does nothing.

+                               // In this case, a hard toggle is required instead.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 headContainer.toggle( active );

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( args.completeCallback ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        args.completeCallback();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1479,7 +1481,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">                                } else {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // There is no panel, so embed the section in the root of the customizer

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // There is no panel, so embed the section in the root of the customizer.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         parentContainer = api.ensure( section.containerPaneParent );

</span><span class="cx" style="display: block; padding: 0 10px">                                        if ( ! section.headContainer.parent().is( parentContainer ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                parentContainer.append( section.headContainer );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1511,7 +1513,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( api.utils.isKeydownButNotEnterEvent( event ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        return;

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                event.preventDefault(); // Keep this AFTER the key filter above

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         event.preventDefault(); // Keep this AFTER the key filter above.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( section.expanded() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        section.collapse();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1718,12 +1720,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        var inject,

</span><span class="cx" style="display: block; padding: 0 10px">                                section = this;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Watch for changes to the panel state

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Watch for changes to the panel state.

</ins><span class="cx" style="display: block; padding: 0 10px">                         inject = function( panelId ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                var parentContainer;

</span><span class="cx" style="display: block; padding: 0 10px">                                api.panel( panelId, function( panel ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // The panel has been registered, wait for it to become ready/initialized

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // The panel has been registered, wait for it to become ready/initialized.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         panel.deferred.embedded.done( function() {

</span><span class="cx" style="display: block; padding: 0 10px">                                                parentContainer = panel.contentContainer;

</span><span class="cx" style="display: block; padding: 0 10px">                                                if ( ! section.headContainer.parent().is( parentContainer ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1737,7 +1739,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">                        section.panel.bind( inject );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        inject( section.panel.get() ); // Since a section may never get a panel, assume that it won't ever get one

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 inject( section.panel.get() ); // Since a section may never get a panel, assume that it won't ever get one.

</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">@@ -1758,17 +1760,17 @@

</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">-                                // Pressing the right arrow key fires a theme:next event

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Pressing the right arrow key fires a theme:next event.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( 39 === event.keyCode ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        section.nextTheme();

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Pressing the left arrow key fires a theme:previous event

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Pressing the left arrow key fires a theme:previous event.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( 37 === event.keyCode ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        section.previousTheme();

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Pressing the escape key fires a theme:collapse event

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Pressing the escape key fires a theme:collapse event.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( 27 === event.keyCode ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        if ( section.$body.hasClass( 'modal-open' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1818,7 +1820,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( api.utils.isKeydownButNotEnterEvent( event ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        return;

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                event.preventDefault(); // Keep this AFTER the key filter above

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         event.preventDefault(); // Keep this AFTER the key filter above.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 section.collapse();

</span><span class="cx" style="display: block; padding: 0 10px">                        });

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1957,11 +1959,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                onChangeExpanded: function ( expanded, args ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Note: there is a second argument 'args' passed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Note: there is a second argument 'args' passed.

</ins><span class="cx" style="display: block; padding: 0 10px">                         var section = this,

</span><span class="cx" style="display: block; padding: 0 10px">                                container = section.contentContainer.closest( '.customize-themes-full-container' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Immediately call the complete callback if there were no changes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Immediately call the complete callback if there were no changes.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( args.unchanged ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( args.completeCallback ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        args.completeCallback();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1976,7 +1978,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        section.loadThemes();

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Collapse any sibling sections/panels

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Collapse any sibling sections/panels.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 api.section.each( function ( otherSection ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        var searchTerm;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2123,7 +2125,8 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                                        _.delay( section.renderScreenshots, 100 ); // Wait for the controls to become visible.

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        if ( 'local' === section.params.filter_type || 100 > themes.length ) { // If we have less than the requested 100 themes, it's the end of the list.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 if ( 'local' === section.params.filter_type || 100 > themes.length ) {

+                                               // If we have less than the requested 100 themes, it's the end of the list.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                 section.fullyLoaded = true;

</span><span class="cx" style="display: block; padding: 0 10px">                                        }

</span><span class="cx" style="display: block; padding: 0 10px">                                } else {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2202,7 +2205,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                container = section.container.closest( '.customize-themes-full-container' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                bottom = container.scrollTop() + container.height();

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                threshold = container.prop( 'scrollHeight' ) - 3000; // Use a fixed distance to the bottom of loaded results to avoid unnecessarily loading results sooner when using a percentage of scroll distance.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Use a fixed distance to the bottom of loaded results to avoid unnecessarily

+                               // loading results sooner when using a percentage of scroll distance.

+                               threshold = container.prop( 'scrollHeight' ) - 3000;

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( bottom > threshold ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        section.loadThemes();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2614,15 +2619,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        el.on( 'keydown', function( event ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                // Return if it's not the tab key

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // When navigating with prev/next focus is already handled

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // When navigating with prev/next focus is already handled.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( 9 !== event.keyCode ) {

</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">-                                // uses jQuery UI to get the tabbable elements

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Uses jQuery UI to get the tabbable elements.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 tabbables = $( ':tabbable', el );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Keep focus within the overlay

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Keep focus within the overlay.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( tabbables.last()[0] === event.target && ! event.shiftKey ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        tabbables.first().focus();

</span><span class="cx" style="display: block; padding: 0 10px">                                        return false;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2797,7 +2802,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                embed: function () {

</span><span class="cx" style="display: block; padding: 0 10px">                        var panel = this,

</span><span class="cx" style="display: block; padding: 0 10px">                                container = $( '#customize-theme-controls' ),

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                parentContainer = $( '.customize-pane-parent' ); // @todo This should be defined elsewhere, and to be configurable

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         parentContainer = $( '.customize-pane-parent' ); // @todo This should be defined elsewhere, and to be configurable.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! panel.headContainer.parent().is( parentContainer ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                parentContainer.append( panel.headContainer );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2821,7 +2826,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( api.utils.isKeydownButNotEnterEvent( event ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        return;

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                event.preventDefault(); // Keep this AFTER the key filter above

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         event.preventDefault(); // Keep this AFTER the key filter above.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( ! panel.expanded() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        panel.expand();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2833,7 +2838,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( api.utils.isKeydownButNotEnterEvent( event ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        return;

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                event.preventDefault(); // Keep this AFTER the key filter above

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         event.preventDefault(); // Keep this AFTER the key filter above.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( panel.expanded() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        panel.collapse();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2908,7 +2913,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                onChangeExpanded: function ( expanded, args ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Immediately call the complete callback if there were no changes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Immediately call the complete callback if there were no changes.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( args.unchanged ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( args.completeCallback ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        args.completeCallback();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2916,7 +2921,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">-                        // Note: there is a second argument 'args' passed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Note: there is a second argument 'args' passed.

</ins><span class="cx" style="display: block; padding: 0 10px">                         var panel = this,

</span><span class="cx" style="display: block; padding: 0 10px">                                accordionSection = panel.contentContainer,

</span><span class="cx" style="display: block; padding: 0 10px">                                overlay = accordionSection.closest( '.wp-full-overlay' ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2927,7 +2932,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                skipTransition;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( expanded && ! accordionSection.hasClass( 'current-panel' ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Collapse any sibling sections/panels

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Collapse any sibling sections/panels.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 api.section.each( function ( section ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        if ( panel.id !== section.panel() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                section.collapse( { duration: 0 } );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3067,7 +3072,7 @@

<span class="cx" style="display: block; padding: 0 10px">                        // Attach regular panel events.

</span><span class="cx" style="display: block; padding: 0 10px">                        api.Panel.prototype.attachEvents.apply( panel );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Temporary since supplying SFTP credentials does not work yet. See #42184

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Temporary since supplying SFTP credentials does not work yet. See #42184.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( api.settings.theme._canInstall && api.settings.theme._filesystemCredentialsNeeded ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                panel.notifications.add( new api.Notification( 'theme_install_unavailable', {

</span><span class="cx" style="display: block; padding: 0 10px">                                        message: api.l10n.themeInstallUnavailable,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3140,7 +3145,7 @@

<span class="cx" style="display: block; padding: 0 10px">                        // Expand/collapse the panel normally.

</span><span class="cx" style="display: block; padding: 0 10px">                        api.Panel.prototype.onChangeExpanded.apply( this, [ expanded, args ] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Immediately call the complete callback if there were no changes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Immediately call the complete callback if there were no changes.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( args.unchanged ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( args.completeCallback ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        args.completeCallback();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3682,15 +3687,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        var control = this,

</span><span class="cx" style="display: block; padding: 0 10px">                                inject;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Watch for changes to the section state

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Watch for changes to the section state.

</ins><span class="cx" style="display: block; padding: 0 10px">                         inject = function ( sectionId ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                var parentContainer;

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                if ( ! sectionId ) { // @todo allow a control to be embedded without a section, for instance a control embedded in the front end.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         if ( ! sectionId ) { // @todo Allow a control to be embedded without a section, for instance a control embedded in the front end.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         return;

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Wait for the section to be registered

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Wait for the section to be registered.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 api.section( sectionId, function ( section ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Wait for the section to be ready/initialized

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Wait for the section to be ready/initialized.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         section.deferred.embedded.done( function () {

</span><span class="cx" style="display: block; padding: 0 10px">                                                parentContainer = ( section.contentContainer.is( 'ul' ) ) ? section.contentContainer : section.contentContainer.find( 'ul:first' );

</span><span class="cx" style="display: block; padding: 0 10px">                                                if ( ! control.container.parent().is( parentContainer ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3724,7 +3729,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        control.addNewPage();

</span><span class="cx" style="display: block; padding: 0 10px">                                });

</span><span class="cx" style="display: block; padding: 0 10px">                                control.container.on( 'keydown', '.create-item-input', function( e ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        if ( 13 === e.which ) { // Enter

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 if ( 13 === e.which ) { // Enter.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                 control.addNewPage();

</span><span class="cx" style="display: block; padding: 0 10px">                                        }

</span><span class="cx" style="display: block; padding: 0 10px">                                });

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3909,7 +3914,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 ( ! $.contains( document, this.container[0] ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // jQuery.fn.slideUp is not hiding an element if it is not in the DOM

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // jQuery.fn.slideUp is not hiding an element if it is not in the DOM.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 this.container.toggle( active );

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( args.completeCallback ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        args.completeCallback();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3957,7 +3962,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">-                        // Support the .dropdown class to open/close complex elements

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Support the .dropdown class to open/close complex elements.

</ins><span class="cx" style="display: block; padding: 0 10px">                         this.container.on( 'click keydown', '.dropdown', function( event ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( api.utils.isKeydownButNotEnterEvent( event ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        return;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3973,7 +3978,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        control.container.parent().parent().find( 'li.library-selected' ).focus();

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Don't want to fire focus and click at same time

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Don't want to fire focus and click at same time.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 toggleFreeze = true;

</span><span class="cx" style="display: block; padding: 0 10px">                                setTimeout(function () {

</span><span class="cx" style="display: block; padding: 0 10px">                                        toggleFreeze = false;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4017,7 +4022,8 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        templateId = control.templateSelector;

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Use default content template when a standard HTML type is used, there isn't a more specific template existing, and the control container is empty.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Use default content template when a standard HTML type is used,

+                       // there isn't a more specific template existing, and the control container is empty.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( templateId === 'customize-control-' + control.params.type + '-content' &&

</span><span class="cx" style="display: block; padding: 0 10px">                                _.contains( standardTypes, control.params.type ) &&

</span><span class="cx" style="display: block; padding: 0 10px">                                ! document.getElementById( 'tmpl-' + templateId ) &&

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4047,6 +4053,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><span class="cx" style="display: block; padding: 0 10px">                 * @since 4.7.0

</span><span class="cx" style="display: block; padding: 0 10px">                 * @access private

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 *

</ins><span class="cx" style="display: block; padding: 0 10px">                  * @return {void}

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                addNewPage: function () {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4070,7 +4077,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        input.removeClass( 'invalid' );

</span><span class="cx" style="display: block; padding: 0 10px">                        input.attr( 'disabled', 'disabled' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // The menus functions add the page, publish when appropriate, and also add the new page to the dropdown-pages controls.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // The menus functions add the page, publish when appropriate,

+                       // and also add the new page to the dropdown-pages controls.

</ins><span class="cx" style="display: block; padding: 0 10px">                         promise = api.Menus.insertAutoDraftPost( {

</span><span class="cx" style="display: block; padding: 0 10px">                                post_title: title,

</span><span class="cx" style="display: block; padding: 0 10px">                                post_type: 'page'

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4199,7 +4207,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        control.container.on( 'click keydown', '.remove-button', control.removeFile );

</span><span class="cx" style="display: block; padding: 0 10px">                        control.container.on( 'click keydown', '.remove-button', control.cleanupPlayer );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Resize the player controls when it becomes visible (ie when section is expanded)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Resize the player controls when it becomes visible (ie when section is expanded).

</ins><span class="cx" style="display: block; padding: 0 10px">                         api.section( control.section() ).container

</span><span class="cx" style="display: block; padding: 0 10px">                                .on( 'expanded', function() {

</span><span class="cx" style="display: block; padding: 0 10px">                                        if ( control.player ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5128,7 +5136,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">-                                event.preventDefault(); // Keep this AFTER the key filter above

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         event.preventDefault(); // Keep this AFTER the key filter above.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 section = api.section( control.section() );

</span><span class="cx" style="display: block; padding: 0 10px">                                section.showDetails( control.params.theme, function() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5196,7 +5204,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                control.params.priority = 101 - matchCount; // Sort results by match count.

</span><span class="cx" style="display: block; padding: 0 10px">                                return true;

</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">-                                control.deactivate(); // Hide control

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         control.deactivate(); // Hide control.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 control.params.priority = 101;

</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">@@ -6498,13 +6506,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        urlParser.href = previewer.origin();

</span><span class="cx" style="display: block; padding: 0 10px">                        previewer.add( 'scheme', urlParser.protocol.replace( /:$/, '' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Limit the URL to internal, front-end links.

-                       //

-                       // If the front end and the admin are served from the same domain, load the

-                       // preview over ssl if the Customizer is being loaded over ssl. This avoids

-                       // insecure content warnings. This is not attempted if the admin and front end

-                       // are on different domains to avoid the case where the front end doesn't have

-                       // ssl certs.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 /*

+                        * Limit the URL to internal, front-end links.

+                        *

+                        * If the front end and the admin are served from the same domain, load the

+                        * preview over ssl if the Customizer is being loaded over ssl. This avoids

+                        * insecure content warnings. This is not attempted if the admin and front end

+                        * are on different domains to avoid the case where the front end doesn't have

+                        * ssl certs.

+                        */

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        previewer.add( 'previewUrl', params.previewUrl ).setter( function( to ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                var result = null, urlParser, queryParams, parsedAllowedUrl, parsedCandidateUrls = [];

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6735,12 +6745,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><span class="cx" style="display: block; padding: 0 10px">                 * @since 3.4.0

</span><span class="cx" style="display: block; padding: 0 10px">                 * @access public

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 *

</ins><span class="cx" style="display: block; padding: 0 10px">                  * @return {void}

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                refresh: function() {

</span><span class="cx" style="display: block; padding: 0 10px">                        var previewer = this, onSettingChange;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Display loading indicator

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Display loading indicator.

</ins><span class="cx" style="display: block; padding: 0 10px">                         previewer.send( 'loading-initiated' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        previewer.abort();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7013,7 +7024,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        activeElement = $( document.activeElement );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Sort the sections within each panel

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Sort the sections within each panel.

</ins><span class="cx" style="display: block; padding: 0 10px">                 api.panel.each( function ( panel ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( 'themes' === panel.id ) {

<span class="cx" style="display: block; padding: 0 10px">                                return; // Don't reflow theme sections, as doing so moves them after the themes container.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7031,7 +7042,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">-                // Sort the controls within each section

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Sort the controls within each section.

</ins><span class="cx" style="display: block; padding: 0 10px">                 api.section.each( function ( section ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        var controls = section.controls(),

</span><span class="cx" style="display: block; padding: 0 10px">                                controlContainers = _.pluck( controls, 'container' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7047,10 +7058,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                } );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Sort the root panels and sections

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Sort the root panels and sections.

</ins><span class="cx" style="display: block; padding: 0 10px">                 rootNodes.sort( api.utils.prioritySort );

</span><span class="cx" style="display: block; padding: 0 10px">                rootHeadContainers = _.pluck( rootNodes, 'headContainer' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                appendContainer = $( '#customize-theme-controls .customize-pane-parent' ); // @todo This should be defined elsewhere, and to be configurable

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         appendContainer = $( '#customize-theme-controls .customize-pane-parent' ); // @todo This should be defined elsewhere, and to be configurable.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! api.utils.areElementListsEqual( rootHeadContainers, appendContainer.children() ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        _( rootNodes ).each( function ( rootNode ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                appendContainer.append( rootNode.headContainer );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7058,7 +7069,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        wasReflowed = 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">-                // Now re-trigger the active Value callbacks to that the panels and sections can decide whether they can be rendered

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Now re-trigger the active Value callbacks so that the panels and sections can decide whether they can be rendered.

</ins><span class="cx" style="display: block; padding: 0 10px">                 api.panel.each( function ( panel ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        var value = panel.active();

</span><span class="cx" style="display: block; padding: 0 10px">                        panel.active.callbacks.fireWith( panel.active, [ value, value ] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7068,7 +7079,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        section.active.callbacks.fireWith( section.active, [ value, 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">-                // Restore focus if there was a reflow and there was an active (focused) element

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Restore focus if there was a reflow and there was an active (focused) element.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( wasReflowed && activeElement ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        activeElement.focus();

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7208,9 +7219,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        cancelScheduleButtonReminder = api.utils.highlightButton( btnWrapper, {

</span><span class="cx" style="display: block; padding: 0 10px">                                                delay: 1000,

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                // Only abort the reminder when the save button is focused.

-                                               // If the user clicks the settings button to toggle the

-                                               // settings closed, we'll still remind them.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         /*

+                                                * Only abort the reminder when the save button is focused.

+                                                * If the user clicks the settings button to toggle the

+                                                * settings closed, we'll still remind them.

+                                                */

</ins><span class="cx" style="display: block; padding: 0 10px">                                                 focusTarget: saveBtn

</span><span class="cx" style="display: block; padding: 0 10px">                                        } );

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7579,7 +7592,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                                if ( '0' === response ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                        response = 'not_logged_in';

</span><span class="cx" style="display: block; padding: 0 10px">                                                } else if ( '-1' === response ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                        // Back-compat in case any other check_ajax_referer() call is dying

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 // Back-compat in case any other check_ajax_referer() call is dying.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                         response = 'invalid_nonce';

</span><span class="cx" style="display: block; padding: 0 10px">                                                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7812,7 +7825,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        api.previewer.send( 'nonce-refresh', nonce );

</span><span class="cx" style="display: block; padding: 0 10px">                });

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Create Settings

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create Settings.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $.each( api.settings.settings, function( id, data ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        var Constructor = api.settingConstructor[ data.type ] || api.Setting;

</span><span class="cx" style="display: block; padding: 0 10px">                        api.add( new Constructor( id, data.value, {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7822,28 +7835,31 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        } ) );

</span><span class="cx" style="display: block; padding: 0 10px">                });

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Create Panels

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create Panels.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $.each( api.settings.panels, function ( id, data ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        var Constructor = api.panelConstructor[ data.type ] || api.Panel, options;

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        options = _.extend( { params: data }, data ); // Inclusion of params alias is for back-compat for custom panels that expect to augment this property.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Inclusion of params alias is for back-compat for custom panels that expect to augment this property.

+                       options = _.extend( { params: data }, data );

</ins><span class="cx" style="display: block; padding: 0 10px">                         api.panel.add( new Constructor( id, options ) );

</span><span class="cx" style="display: block; padding: 0 10px">                });

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Create Sections

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create Sections.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $.each( api.settings.sections, function ( id, data ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        var Constructor = api.sectionConstructor[ data.type ] || api.Section, options;

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        options = _.extend( { params: data }, data ); // Inclusion of params alias is for back-compat for custom sections that expect to augment this property.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Inclusion of params alias is for back-compat for custom sections that expect to augment this property.

+                       options = _.extend( { params: data }, data );

</ins><span class="cx" style="display: block; padding: 0 10px">                         api.section.add( new Constructor( id, options ) );

</span><span class="cx" style="display: block; padding: 0 10px">                });

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Create Controls

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create Controls.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $.each( api.settings.controls, function( id, data ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        var Constructor = api.controlConstructor[ data.type ] || api.Control, options;

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        options = _.extend( { params: data }, data ); // Inclusion of params alias is for back-compat for custom controls that expect to augment this property.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Inclusion of params alias is for back-compat for custom controls that expect to augment this property.

+                       options = _.extend( { params: data }, data );

</ins><span class="cx" style="display: block; padding: 0 10px">                         api.control.add( new Constructor( id, options ) );

</span><span class="cx" style="display: block; padding: 0 10px">                });

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Focus the autofocused element

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Focus the autofocused element.

</ins><span class="cx" style="display: block; padding: 0 10px">                 _.each( [ 'panel', 'section', 'control' ], function( type ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        var id = api.settings.autofocus[ type ];

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! id ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7896,7 +7912,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        api.notifications.render();

</span><span class="cx" style="display: block; padding: 0 10px">                });

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Save and activated states

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Save and activated states.

</ins><span class="cx" style="display: block; padding: 0 10px">                 (function( state ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        var saved = state.instance( 'saved' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                saving = state.instance( 'saving' ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8690,7 +8706,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        };

</span><span class="cx" style="display: block; padding: 0 10px">                }());

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Previewed device bindings. (The api.previewedDevice property is how this Value was first introduced, but since it has moved to api.state.)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Previewed device bindings. (The api.previewedDevice property

+               // is how this Value was first introduced, but since it has moved to api.state.)

</ins><span class="cx" style="display: block; padding: 0 10px">                 api.previewedDevice = api.state( 'previewedDevice' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Set the default device.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8797,7 +8814,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                api.state( 'selectedChangesetStatus' ).unbind( startPromptingBeforeUnload );

</span><span class="cx" style="display: block; padding: 0 10px">                                api.state( 'selectedChangesetDate' ).unbind( startPromptingBeforeUnload );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Prompt user with AYS dialog if leaving the Customizer with unsaved changes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Prompt user with AYS dialog if leaving the Customizer with unsaved changes.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $( window ).on( 'beforeunload.customize-confirm', function() {

</span><span class="cx" style="display: block; padding: 0 10px">                                        if ( ! isCleanState() && ! api.state( 'changesetLocked' ).get() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                setTimeout( function() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8882,7 +8899,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">-                // Pass titles to the parent

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Pass titles to the parent.

</ins><span class="cx" style="display: block; padding: 0 10px">                 api.bind( 'title', function( newTitle ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        parent.send( 'title', newTitle );

</span><span class="cx" style="display: block; padding: 0 10px">                });

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8894,7 +8911,7 @@

<span class="cx" style="display: block; padding: 0 10px">                // Initialize the connection with the parent frame.

</span><span class="cx" style="display: block; padding: 0 10px">                parent.send( 'ready' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Control visibility for default controls

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Control visibility for default controls.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $.each({

</span><span class="cx" style="display: block; padding: 0 10px">                        'background_image': {

</span><span class="cx" style="display: block; padding: 0 10px">                                controls: [ 'background_preset', 'background_position', 'background_size', 'background_repeat', 'background_attachment' ],

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8926,7 +8943,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                api.control( 'background_preset', function( control ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        var visibility, defaultValues, values, toggleVisibility, updateSettings, preset;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        visibility = { // position, size, repeat, attachment

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 visibility = { // position, size, repeat, attachment.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'default': [ false, false, false, false ],

</span><span class="cx" style="display: block; padding: 0 10px">                                'fill': [ true, false, false, false ],

</span><span class="cx" style="display: block; padding: 0 10px">                                'fit': [ true, false, true, false ],

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8942,7 +8959,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                _wpCustomizeBackground.defaults['default-attachment']

</span><span class="cx" style="display: block; padding: 0 10px">                        ];

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        values = { // position_x, position_y, size, repeat, attachment

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 values = { // position_x, position_y, size, repeat, attachment.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'default': defaultValues,

</span><span class="cx" style="display: block; padding: 0 10px">                                'fill': [ 'left', 'top', 'cover', 'no-repeat', 'fixed' ],

</span><span class="cx" style="display: block; padding: 0 10px">                                'fit': [ 'left', 'top', 'contain', 'no-repeat', 'fixed' ],

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8949,7 +8966,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'repeat': [ 'left', 'top', 'auto', 'repeat', 'scroll' ]

</span><span class="cx" style="display: block; padding: 0 10px">                        };

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // @todo These should actually toggle the active state, but without the preview overriding the state in data.activeControls.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // @todo These should actually toggle the active state,

+                       // but without the preview overriding the state in data.activeControls.

</ins><span class="cx" style="display: block; padding: 0 10px">                         toggleVisibility = function( preset ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                _.each( [ 'background_position', 'background_size', 'background_repeat', 'background_attachment' ], function( controlId, i ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        var control = api.control( controlId );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9009,7 +9027,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">-                // Juggle the two controls that use header_textcolor

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Juggle the two controls that use header_textcolor.

</ins><span class="cx" style="display: block; padding: 0 10px">                 api.control( 'display_header_text', function( control ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        var last = '';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunksrcjs_enqueueswpcustomizeloaderjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/wp/customize/loader.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/wp/customize/loader.js     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/wp/customize/loader.js       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -119,7 +119,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                return window.location = src;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Store the document title prior to opening the Live Preview

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Store the document title prior to opening the Live Preview.

</ins><span class="cx" style="display: block; padding: 0 10px">                         this.originalDocumentTitle = document.title;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        this.active = true;

</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">                                }

</span><span class="cx" style="display: block; padding: 0 10px">                        });

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Prompt AYS dialog when navigating away

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Prompt AYS dialog when navigating away.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $( window ).on( 'beforeunload', this.beforeunload );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        this.messenger.bind( 'saved', function () {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -223,13 +223,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        self.active = false;

</span><span class="cx" style="display: block; padding: 0 10px">                                        self.trigger( 'close' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Restore document title prior to opening the Live Preview

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Restore document title prior to opening the Live Preview.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         if ( self.originalDocumentTitle ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                document.title = self.originalDocumentTitle;

</span><span class="cx" style="display: block; padding: 0 10px">                                        }

</span><span class="cx" style="display: block; padding: 0 10px">                                } else {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Go forward since Customizer is exited by history.back()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Go forward since Customizer is exited by history.back().

</ins><span class="cx" style="display: block; padding: 0 10px">                                         history.forward();

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px">                                self.messenger.unbind( 'confirmed-close', onConfirmClose );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -286,6 +286,6 @@

</span><span class="cx" style="display: block; padding: 0 10px">                Loader.initialize();

</span><span class="cx" style="display: block; padding: 0 10px">        });

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Expose the API publicly on window.wp.customize.Loader

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Expose the API publicly on window.wp.customize.Loader.

</ins><span class="cx" style="display: block; padding: 0 10px">         api.Loader = Loader;

</span><span class="cx" style="display: block; padding: 0 10px"> })( wp, jQuery );

</span></span></pre></div>

<a id="trunksrcjs_enqueueswpcustomizemodelsjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/wp/customize/models.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/wp/customize/models.js     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/wp/customize/models.js       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -53,8 +53,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        var data = this.get('header'),

</span><span class="cx" style="display: block; padding: 0 10px">                                curr = api.HeaderTool.currentHeader.get('header').attachment_id;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // If the image we're removing is also the current header, unset

-                       // the latter

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // If the image we're removing is also the current header,

+                       // unset the latter.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if (curr && data.attachment_id === curr) {

</span><span class="cx" style="display: block; padding: 0 10px">                                api.HeaderTool.currentHeader.trigger('hide');

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -142,7 +142,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        api.HeaderTool.ChoiceList = Backbone.Collection.extend({

</span><span class="cx" style="display: block; padding: 0 10px">                model: api.HeaderTool.ImageModel,

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Ordered from most recently used to least

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Ordered from most recently used to least.

</ins><span class="cx" style="display: block; padding: 0 10px">                 comparator: function(model) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return -model.get('header').timestamp;

</span><span class="cx" style="display: block; padding: 0 10px">                },

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -151,18 +151,18 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        var current = api.HeaderTool.currentHeader.get('choice').replace(/^https?:\/\//, ''),

</span><span class="cx" style="display: block; padding: 0 10px">                                isRandom = this.isRandomChoice(api.get().header_image);

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Overridable by an extending class

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Overridable by an extending class.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if (!this.type) {

</span><span class="cx" style="display: block; padding: 0 10px">                                this.type = 'uploaded';

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Overridable by an extending class

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Overridable by an extending class.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if (typeof this.data === 'undefined') {

</span><span class="cx" style="display: block; padding: 0 10px">                                this.data = _wpCustomizeHeader.uploads;

</span><span class="cx" style="display: 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 (isRandom) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // So that when adding data we don't hide regular images

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // So that when adding data we don't hide regular images.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 current = api.get().header_image;

</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="trunksrcjs_enqueueswpcustomizenavmenusjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/wp/customize/nav-menus.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/wp/customize/nav-menus.js  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/wp/customize/nav-menus.js    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -203,9 +203,11 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        _.bindAll( this, 'close' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // If the available menu items panel is open and the customize controls are

-                       // interacted with (other than an item being deleted), then close the

-                       // available menu items panel. Also close on back button click.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 /*

+                        * If the available menu items panel is open and the customize controls

+                        * are interacted with (other than an item being deleted), then close

+                        * the available menu items panel. Also close on back button click.

+                        */

</ins><span class="cx" style="display: block; padding: 0 10px">                         $( '#customize-controls, .customize-section-back' ).on( 'click keydown', function( e ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                var isDeleteBtn = $( e.target ).is( '.item-delete, .item-delete *' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                        isAddNewBtn = $( e.target ).is( '.add-new-menu-item, .add-new-menu-item *' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -252,7 +254,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">-                        // Close the panel if the URL in the preview changes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Close the panel if the URL in the preview changes.

</ins><span class="cx" style="display: block; padding: 0 10px">                         api.previewer.bind( 'url', this.close );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        self.delegateEvents();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -496,7 +498,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Submit handler for keypress and click on menu item.

</span><span class="cx" style="display: block; padding: 0 10px">                _submit: function( event ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Only proceed with keypress if it is Enter or Spacebar

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Only proceed with keypress if it is Enter or Spacebar.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( 'keypress' === event.type && ( 13 !== event.which && 32 !== event.which ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                return;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -717,7 +719,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        this.$search.focus();

</span><span class="cx" style="display: block; padding: 0 10px">                },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Closes the panel

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Closes the panel.

</ins><span class="cx" style="display: block; padding: 0 10px">                 close: function( options ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        options = options || {};

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -741,7 +743,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                isBackTab = ( 9 === event.which && event.shiftKey ),

</span><span class="cx" style="display: block; padding: 0 10px">                                isSearchFocused = $( event.target ).is( this.$search );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // If enter pressed but nothing entered, don't do anything

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // If enter pressed but nothing entered, don't do anything.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( isEnter && ! this.$search.val() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                return;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -781,7 +783,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px">                                event.preventDefault();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Hide description

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Hide description.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( content.not( ':hidden' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        content.slideUp( 'fast' );

</span><span class="cx" style="display: block; padding: 0 10px">                                        help.attr( 'aria-expanded', 'false' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -802,7 +804,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">-                        // Help toggle

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Help toggle.

</ins><span class="cx" style="display: block; padding: 0 10px">                         help.on( 'click keydown', function( event ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( api.utils.isKeydownButNotEnterEvent( event ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        return;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1062,7 +1064,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                menuAutoAddControl.active.set( 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">-                        // Add the control for deleting the menu

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Add the control for deleting the menu.

</ins><span class="cx" style="display: block; padding: 0 10px">                         menuDeleteControlId = section.id + '[delete]';

</span><span class="cx" style="display: block; padding: 0 10px">                        menuDeleteControl = api.control( menuDeleteControlId );

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! menuDeleteControl ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1126,7 +1128,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                wpNavMenu.menuList = section.contentContainer;

</span><span class="cx" style="display: block; padding: 0 10px">                                wpNavMenu.targetList = wpNavMenu.menuList;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Add attributes needed by wpNavMenu

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Add attributes needed by wpNavMenu.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $( '#menu-to-edit' ).removeAttr( 'id' );

</span><span class="cx" style="display: block; padding: 0 10px">                                wpNavMenu.menuList.attr( 'id', 'menu-to-edit' ).addClass( 'menu' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1145,7 +1147,8 @@

<span class="cx" style="display: block; padding: 0 10px">                                                wpNavMenu.initSortables(); // Depends on menu-to-edit ID being set above.

<span class="cx" style="display: block; padding: 0 10px">                                                section.deferred.initSortables.resolve( wpNavMenu.menuList ); // Now MenuControl can extend the sortable.

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                // @todo Note that wp.customize.reflowPaneContents() is debounced, so this immediate change will show a slight flicker while priorities get updated.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         // @todo Note that wp.customize.reflowPaneContents() is debounced,

+                                               // so this immediate change will show a slight flicker while priorities get updated.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                 api.control( 'nav_menu[' + String( section.params.menu_id ) + ']' ).reflowMenuItems();

</span><span class="cx" style="display: block; padding: 0 10px">                                        }

</span><span class="cx" style="display: block; padding: 0 10px">                                        if ( _.isFunction( completeCallback ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1415,7 +1418,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        navMenuLocationSetting = api( 'nav_menu_locations[' + checkbox.data( 'location-id' ) + ']' );

</span><span class="cx" style="display: block; padding: 0 10px">                                        navMenuLocationSetting.set( menuSection.params.menu_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">-                                        // Reset state for next new menu

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Reset state for next new menu.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         checkbox.prop( 'checked', 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">@@ -1698,7 +1701,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        control.elements.classes = new api.Element( control.container.find( '.edit-menu-item-classes' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        control.elements.xfn = new api.Element( control.container.find( '.edit-menu-item-xfn' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        control.elements.description = new api.Element( control.container.find( '.edit-menu-item-description' ) );

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // @todo allow other elements, added by plugins, to be automatically picked up here; allow additional values to be added to setting array.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // @todo Allow other elements, added by plugins, to be automatically picked up here;

+                       // allow additional values to be added to setting array.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        _.each( control.elements, function( element, property ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                element.bind(function( value ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1790,7 +1794,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $removeBtn = control.container.find( '.item-delete' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $removeBtn.on( 'click', function() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Find an adjacent element to add focus to when this menu item goes away

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Find an adjacent element to add focus to when this menu item goes away.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 var addingItems = true, $adjacentFocusTarget, $next, $prev;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( ! $( 'body' ).hasClass( 'adding-menu-items' ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1811,7 +1815,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                control.container.slideUp( function() {

</span><span class="cx" style="display: block; padding: 0 10px">                                        control.setting.set( false );

</span><span class="cx" style="display: block; padding: 0 10px">                                        wp.a11y.speak( api.Menus.data.l10n.itemDeleted );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        $adjacentFocusTarget.focus(); // keyboard accessibility

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 $adjacentFocusTarget.focus(); // Keyboard accessibility.

</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">                                control.setting.set( false );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2778,13 +2782,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        action = sectionTitle.find( '.customize-action' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                        name = displayNavMenuName( menu.name );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Update the control title

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Update the control title.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 controlTitle.text( name );

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( location.length ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        location.appendTo( controlTitle );

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Update the section title

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Update the section title.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 sectionTitle.text( name );

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( action.length ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        action.prependTo( sectionTitle );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2981,7 +2985,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        position: position

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px">                        );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        delete item.id; // only used by Backbone

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 delete item.id; // Only used by Backbone.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        placeholderId = api.Menus.generatePlaceholderAutoIncrementId();

</span><span class="cx" style="display: block; padding: 0 10px">                        customizeId = 'nav_menu_item[' + String( placeholderId ) + ']';

</span></span></pre></div>

<a id="trunksrcjs_enqueueswpcustomizepreviewwidgetsjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/wp/customize/preview-widgets.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/wp/customize/preview-widgets.js    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/wp/customize/preview-widgets.js      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -672,7 +672,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        self.preview.send( 'highlight-widget-control', $( this ).prop( '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">-                // Open expand the widget control when shift+clicking the widget element

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Open expand the widget control when shift+clicking the widget element.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $( document ).on( 'click', selector, function( e ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! e.shiftKey ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                return;

</span></span></pre></div>

<a id="trunksrcjs_enqueueswpcustomizepreviewjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/wp/customize/preview.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/wp/customize/preview.js    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/wp/customize/preview.js      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -232,8 +232,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @since 4.7.0

</span><span class="cx" style="display: block; padding: 0 10px">         * @access protected

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * @access private

</ins><span class="cx" style="display: block; padding: 0 10px">          *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @access private

</del><span class="cx" style="display: block; padding: 0 10px">          * @return {void}

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        api.addLinkPreviewing = function addLinkPreviewing() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -337,7 +337,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        api.prepareLinkPreview = function prepareLinkPreview( element ) {

</span><span class="cx" style="display: block; padding: 0 10px">                var queryParams, $element = $( element );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Skip elements with no href attribute. Check first to avoid more expensive checks down the road

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        // Skip elements with no href attribute. Check first to avoid more expensive checks down the road.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! element.hasAttribute( 'href' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">             return;

</span><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -357,7 +357,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        element.protocol = 'https:';

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Ignore links with class wp-playlist-caption

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Ignore links with class wp-playlist-caption.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $element.hasClass( 'wp-playlist-caption' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span></span></pre></div>

<a id="trunksrcjs_enqueueswpcustomizeselectiverefreshjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/wp/customize/selective-refresh.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/wp/customize/selective-refresh.js  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/wp/customize/selective-refresh.js    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -442,7 +442,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( partial.params.containerInclusive ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Note that content may be an empty string, and in this case jQuery will just remove the oldContainer

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Note that content may be an empty string, and in this case jQuery will just remove the oldContainer.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         newContainerElement = $( content );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                                        // Merge the new context on top of the old context.

</span></span></pre></div>

<a id="trunksrcjs_enqueueswpcustomizewidgetsjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/wp/customize/widgets.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/wp/customize/widgets.js    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/wp/customize/widgets.js      2020-01-29 00:43:23 UTC (rev 47122)

</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">        api.Widgets = api.Widgets || {};

</span><span class="cx" style="display: block; padding: 0 10px">        api.Widgets.savedWidgetIds = {};

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Link settings

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Link settings.

</ins><span class="cx" style="display: block; padding: 0 10px">         api.Widgets.data = _wpCustomizeWidgetsSettings || {};

</span><span class="cx" style="display: block; padding: 0 10px">        l10n = api.Widgets.data.l10n;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -59,16 +59,16 @@

</span><span class="cx" style="display: block; padding: 0 10px">                model: api.Widgets.WidgetModel,

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                // Controls searching on the current widget collection

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // and triggers an update event

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // and triggers an update event.

</ins><span class="cx" style="display: block; padding: 0 10px">                 doSearch: function( value ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Don't do anything if we've already done this search

-                       // Useful because the search handler fires multiple times per keystroke

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Don't do anything if we've already done this search.

+                       // Useful because the search handler fires multiple times per keystroke.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( this.terms === value ) {

</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">-                        // Updates terms with the value passed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Updates terms with the value passed.

</ins><span class="cx" style="display: block; padding: 0 10px">                         this.terms = value;

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                        // If we have terms, run a search...

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,16 +84,16 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Performs a search within the collection

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Performs a search within the collection.

</ins><span class="cx" style="display: block; padding: 0 10px">                 // @uses RegExp

</span><span class="cx" style="display: block; padding: 0 10px">                search: function( term ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        var match, haystack;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Escape the term string for RegExp meta characters

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Escape the term string for RegExp meta characters.

</ins><span class="cx" style="display: block; padding: 0 10px">                         term = term.replace( /[-\/\\^$*+?.()|[\]{}]/g, '\\$&' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        // Consider spaces as word delimiters and match the whole string

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // so matching terms can be combined

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // so matching terms can be combined.

</ins><span class="cx" style="display: block; padding: 0 10px">                         term = term.replace( / /g, ')(?=.*' );

</span><span class="cx" style="display: block; padding: 0 10px">                        match = new RegExp( '^(?=.*' + term + ').+', 'i' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -150,10 +150,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'keydown' : 'keyboardAccessible'

</span><span class="cx" style="display: block; padding: 0 10px">                },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Cache current selected widget

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Cache current selected widget.

</ins><span class="cx" style="display: block; padding: 0 10px">                 selected: null,

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Cache sidebar control which has opened panel

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Cache sidebar control which has opened panel.

</ins><span class="cx" style="display: block; padding: 0 10px">                 currentSidebarControl: null,

</span><span class="cx" style="display: block; padding: 0 10px">                $search: null,

</span><span class="cx" style="display: block; padding: 0 10px">                $clearResults: null,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -181,9 +181,11 @@

<span class="cx" style="display: block; padding: 0 10px">                        // Set the initial search count to the number of available widgets.

</span><span class="cx" style="display: block; padding: 0 10px">                        this.searchMatchesCount = this.collection.length;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // If the available widgets panel is open and the customize controls are

-                       // interacted with (i.e. available widgets panel is blurred) then close the

-                       // available widgets panel. Also close on back button click.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 /*

+                        * If the available widgets panel is open and the customize controls

+                        * are interacted with (i.e. available widgets panel is blurred) then

+                        * close the available widgets panel. Also close on back button click.

+                        */

</ins><span class="cx" style="display: block; padding: 0 10px">                         $( '#customize-controls, #available-widgets .customize-section-title' ).on( 'click keydown', function( e ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                var isAddNewBtn = $( e.target ).is( '.add-new-widget, .add-new-widget *' );

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( $( 'body' ).hasClass( 'adding-widget' ) && ! isAddNewBtn ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -197,7 +199,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                self.collection.doSearch( '' );

</span><span class="cx" style="display: block; padding: 0 10px">                        } );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Close the panel if the URL in the preview changes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Close the panel if the URL in the preview changes.

</ins><span class="cx" style="display: block; padding: 0 10px">                         api.previewer.bind( 'url', this.close );

</span><span class="cx" style="display: block; padding: 0 10px">                },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -213,19 +215,19 @@

<span class="cx" style="display: block; padding: 0 10px">                        // Announce how many search results.

</span><span class="cx" style="display: block; padding: 0 10px">                        this.announceSearchMatches();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Remove a widget from being selected if it is no longer visible

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Remove a widget from being selected if it is no longer visible.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( this.selected && ! this.selected.is( ':visible' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                this.selected.removeClass( 'selected' );

</span><span class="cx" style="display: block; padding: 0 10px">                                this.selected = null;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // If a widget was selected but the filter value has been cleared out, clear selection

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // If a widget was selected but the filter value has been cleared out, clear selection.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( this.selected && ! event.target.value ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                this.selected.removeClass( 'selected' );

</span><span class="cx" style="display: block; padding: 0 10px">                                this.selected = null;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // If a filter has been entered and a widget hasn't been selected, select the first one shown

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // If a filter has been entered and a widget hasn't been selected, select the first one shown.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( ! this.selected && event.target.value ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                firstVisible = this.$el.find( '> .widget-tpl:visible:first' );

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( firstVisible.length ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -301,7 +303,7 @@

<span class="cx" style="display: block; padding: 0 10px">                 * Handles submit for keypress and click on widget.

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                _submit: function( event ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Only proceed with keypress if it is Enter or Spacebar

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Only proceed with keypress if it is Enter or Spacebar.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( event.type === 'keypress' && ( event.which !== 13 && event.which !== 32 ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                return;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -345,7 +347,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                open: function( sidebarControl ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        this.currentSidebarControl = sidebarControl;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Wide widget controls appear over the preview, and so they need to be collapsed when the panel opens

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Wide widget controls appear over the preview, and so they need to be collapsed when the panel opens.

</ins><span class="cx" style="display: block; padding: 0 10px">                         _( this.currentSidebarControl.getWidgetFormControls() ).each( function( control ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( control.params.is_wide ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        control.collapseForm();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -360,7 +362,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        this.$el.find( '.selected' ).removeClass( 'selected' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Reset search

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Reset search.

</ins><span class="cx" style="display: block; padding: 0 10px">                         this.collection.doSearch( '' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! api.settings.browser.mobile ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -428,7 +430,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 enter pressed but nothing entered, don't do anything

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // If enter pressed but nothing entered, don't do anything.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( isEnter && ! this.$search.val() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                return;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -602,7 +604,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                _setupModel: function() {

</span><span class="cx" style="display: block; padding: 0 10px">                        var self = this, rememberSavedWidgetId;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Remember saved widgets so we know which to trash (move to inactive widgets sidebar)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Remember saved widgets so we know which to trash (move to inactive widgets sidebar).

</ins><span class="cx" style="display: block; padding: 0 10px">                         rememberSavedWidgetId = function() {

</span><span class="cx" style="display: block; padding: 0 10px">                                api.Widgets.savedWidgetIds[self.params.widget_id] = true;

</span><span class="cx" style="display: block; padding: 0 10px">                        };

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -613,7 +615,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        this.isWidgetUpdating = false;

</span><span class="cx" style="display: block; padding: 0 10px">                        this.liveUpdateMode = 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">-                        // Update widget whenever model changes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Update widget whenever model changes.

</ins><span class="cx" style="display: block; padding: 0 10px">                         this.setting.bind( function( to, from ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( ! _( from ).isEqual( to ) && ! self.isWidgetUpdating ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        self.updateWidget( { instance: to } );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -658,10 +660,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        top;

</span><span class="cx" style="display: block; padding: 0 10px">                                $widgetInside.css( 'max-height', windowHeight );

</span><span class="cx" style="display: block; padding: 0 10px">                                top = Math.max(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        0, // prevent top from going off screen

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 0, // Prevent top from going off screen.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         Math.min(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                Math.max( offsetTop, 0 ), // distance widget in panel is from top of screen

-                                               windowHeight - formHeight // flush up against bottom of screen

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         Math.max( offsetTop, 0 ), // Distance widget in panel is from top of screen.

+                                               windowHeight - formHeight // Flush up against bottom of screen.

</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">                                $widgetInside.css( 'top', top );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -680,7 +682,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                $themeControlsContainer.off( 'expanded collapsed', positionWidget );

</span><span class="cx" style="display: block; padding: 0 10px">                        } );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Reposition whenever a sidebar's widgets are changed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Reposition whenever a sidebar's widgets are changed.

</ins><span class="cx" style="display: block; padding: 0 10px">                         api.each( function( setting ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( 0 === setting.id.indexOf( 'sidebars_widgets[' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        setting.bind( function() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -711,7 +713,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $closeBtn = this.container.find( '.widget-control-close' );

</span><span class="cx" style="display: block; padding: 0 10px">                        $closeBtn.on( 'click', function() {

</span><span class="cx" style="display: block; padding: 0 10px">                                self.collapse();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                self.container.find( '.widget-top .widget-action:first' ).focus(); // keyboard accessibility

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         self.container.find( '.widget-top .widget-action:first' ).focus(); // Keyboard accessibility.

</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">@@ -838,7 +840,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                                wp.a11y.speak( l10n.widgetMovedDown );

</span><span class="cx" style="display: block; padding: 0 10px">                                        }

</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 ).focus(); // re-focus after the container was moved

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 $( this ).focus(); // Re-focus after the container was moved.

</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">@@ -886,12 +888,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                _setupHighlightEffects: function() {

</span><span class="cx" style="display: block; padding: 0 10px">                        var self = this;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Highlight whenever hovering or clicking over the form

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Highlight whenever hovering or clicking over the form.

</ins><span class="cx" style="display: block; padding: 0 10px">                         this.container.on( 'mouseenter click', function() {

</span><span class="cx" style="display: block; padding: 0 10px">                                self.setting.previewer.send( 'highlight-widget', self.params.widget_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">-                        // Highlight when the setting is updated

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Highlight when the setting is updated.

</ins><span class="cx" style="display: block; padding: 0 10px">                         this.setting.bind( function() {

</span><span class="cx" style="display: block; padding: 0 10px">                                self.setting.previewer.send( 'highlight-widget', self.params.widget_id );

</span><span class="cx" style="display: block; padding: 0 10px">                        } );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -907,7 +909,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $widgetRoot = this.container.find( '.widget:first' );

</span><span class="cx" style="display: block; padding: 0 10px">                        $widgetContent = $widgetRoot.find( '.widget-content:first' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Configure update button

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Configure update button.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $saveBtn = this.container.find( '.widget-control-save' );

</span><span class="cx" style="display: block; padding: 0 10px">                        $saveBtn.val( l10n.saveBtnLabel );

</span><span class="cx" style="display: block; padding: 0 10px">                        $saveBtn.attr( 'title', l10n.saveBtnTooltip );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -921,15 +923,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                self.updateWidget();

</span><span class="cx" style="display: block; padding: 0 10px">                        }, 250 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Trigger widget form update when hitting Enter within an input

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Trigger widget form update when hitting Enter within an input.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $widgetContent.on( 'keydown', 'input', function( e ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                if ( 13 === e.which ) { // Enter

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         if ( 13 === e.which ) { // Enter.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         e.preventDefault();

</span><span class="cx" style="display: block; padding: 0 10px">                                        self.updateWidget( { ignoreActiveElement: true } );

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px">                        } );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Handle widgets that support live previews

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Handle widgets that support live previews.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $widgetContent.on( 'change input propertychange', ':input', function( e ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( ! self.liveUpdateMode ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        return;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -939,7 +941,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">-                        // Remove loading indicators when the setting is saved and the preview updates

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Remove loading indicators when the setting is saved and the preview updates.

</ins><span class="cx" style="display: block; padding: 0 10px">                         this.setting.previewer.channel.bind( 'synced', function() {

</span><span class="cx" style="display: block; padding: 0 10px">                                self.container.removeClass( 'previewer-loading' );

</span><span class="cx" style="display: block; padding: 0 10px">                        } );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -972,7 +974,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                 * @param {function}  args.completeCallback

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                onChangeActive: function ( active, args ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Note: there is a second 'args' parameter being passed, merged on top of this.defaultActiveArguments

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Note: there is a second 'args' parameter being passed, merged on top of this.defaultActiveArguments.

</ins><span class="cx" style="display: block; padding: 0 10px">                         this.container.toggleClass( 'widget-rendered', active );

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( args.completeCallback ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                args.completeCallback();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -985,10 +987,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                _setupRemoveUI: function() {

</span><span class="cx" style="display: block; padding: 0 10px">                        var self = this, $removeBtn, replaceDeleteWithRemove;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Configure remove button

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Configure remove button.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $removeBtn = this.container.find( '.widget-control-remove' );

</span><span class="cx" style="display: block; padding: 0 10px">                        $removeBtn.on( 'click', function() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Find an adjacent element to add focus to when this widget goes away

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Find an adjacent element to add focus to when this widget goes away.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 var $adjacentFocusTarget;

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( self.container.next().is( '.customize-control-widget_form' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        $adjacentFocusTarget = self.container.next().find( '.widget-action:first' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1015,12 +1017,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        sidebarWidgetIds.splice( i, 1 );

</span><span class="cx" style="display: block; padding: 0 10px">                                        sidebarsWidgetsControl.setting( sidebarWidgetIds );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        $adjacentFocusTarget.focus(); // keyboard accessibility

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 $adjacentFocusTarget.focus(); // Keyboard accessibility.

</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="cx" style="display: block; padding: 0 10px">                        replaceDeleteWithRemove = function() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $removeBtn.text( l10n.removeBtnLabel ); // wp_widget_control() outputs the button as "Delete"

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $removeBtn.text( l10n.removeBtnLabel ); // wp_widget_control() outputs the button as "Delete".

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $removeBtn.attr( 'title', l10n.removeBtnTooltip );

</span><span class="cx" style="display: block; padding: 0 10px">                        };

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1105,7 +1107,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( ! $.isArray( state ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        state = [];

</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">-                                        // Make sure all state items are strings since the DOM value is a string

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Make sure all state items are strings since the DOM value is a string.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         state = _.map( state, function ( value ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                return String( value );

</span><span class="cx" style="display: block; padding: 0 10px">                                        } );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1169,7 +1171,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $widgetRoot = this.container.find( '.widget:first' );

</span><span class="cx" style="display: block; padding: 0 10px">                        $widgetContent = $widgetRoot.find( '.widget-content:first' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Remove a previous error message

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Remove a previous error message.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $widgetContent.find( '.widget-error' ).remove();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        this.container.addClass( 'widget-form-loading' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1191,9 +1193,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        data = $.param( params );

</span><span class="cx" style="display: block; padding: 0 10px">                        $inputs = this._getInputs( $widgetContent );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Store the value we're submitting in data so that when the response comes back,

-                       // we know if it got sanitized; if there is no difference in the sanitized value,

-                       // then we do not need to touch the UI and mess up the user's ongoing editing.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 /*

+                        * Store the value we're submitting in data so that when the response comes back,

+                        * we know if it got sanitized; if there is no difference in the sanitized value,

+                        * then we do not need to touch the UI and mess up the user's ongoing editing.

+                        */

</ins><span class="cx" style="display: block; padding: 0 10px">                         $inputs.each( function() {

</span><span class="cx" style="display: block; padding: 0 10px">                                $( this ).data( 'state' + updateNumber, self._getInputState( this ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        } );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1236,7 +1240,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        $sanitizedInputs = self._getInputs( sanitizedForm );

</span><span class="cx" style="display: block; padding: 0 10px">                                        hasSameInputsInResponse = self._getInputsSignature( $inputs ) === self._getInputsSignature( $sanitizedInputs );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Restore live update mode if sanitized fields are now aligned with the existing fields

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Restore live update mode if sanitized fields are now aligned with the existing fields.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         if ( hasSameInputsInResponse && ! self.liveUpdateMode ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                self.liveUpdateMode = true;

</span><span class="cx" style="display: block; padding: 0 10px">                                                self.container.removeClass( 'widget-form-disabled' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1243,7 +1247,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                                self.container.find( 'input[name="savewidget"]' ).hide();

</span><span class="cx" style="display: block; padding: 0 10px">                                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Sync sanitized field states to existing fields if they are aligned

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Sync sanitized field states to existing fields if they are aligned.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         if ( hasSameInputsInResponse && self.liveUpdateMode ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                $inputs.each( function( i ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                        var $input = $( this ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1262,13 +1266,13 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                                $( document ).trigger( 'widget-synced', [ $widgetRoot, r.data.form ] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Otherwise, if sanitized fields are not aligned with existing fields, disable live update mode if enabled

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Otherwise, if sanitized fields are not aligned with existing fields, disable live update mode if enabled.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         } else if ( self.liveUpdateMode ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                self.liveUpdateMode = false;

</span><span class="cx" style="display: block; padding: 0 10px">                                                self.container.find( 'input[name="savewidget"]' ).show();

</span><span class="cx" style="display: block; padding: 0 10px">                                                isLiveUpdateAborted = 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">-                                        // Otherwise, replace existing form with the sanitized form

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Otherwise, replace existing form with the sanitized form.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         } else {

</span><span class="cx" style="display: block; padding: 0 10px">                                                $widgetContent.html( r.data.form );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1284,11 +1288,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                         */

</span><span class="cx" style="display: block; padding: 0 10px">                                        isChanged = ! isLiveUpdateAborted && ! _( self.setting() ).isEqual( r.data.instance );

</span><span class="cx" style="display: block; padding: 0 10px">                                        if ( isChanged ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                self.isWidgetUpdating = true; // suppress triggering another updateWidget

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         self.isWidgetUpdating = true; // Suppress triggering another updateWidget.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                 self.setting( r.data.instance );

</span><span class="cx" style="display: block; padding: 0 10px">                                                self.isWidgetUpdating = false;

</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">-                                                // no change was made, so stop the spinner now instead of when the preview would updates

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         // No change was made, so stop the spinner now instead of when the preview would updates.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                 self.container.removeClass( 'previewer-loading' );

</span><span class="cx" style="display: block; padding: 0 10px">                                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1296,7 +1300,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                                completeCallback.call( self, null, { noChange: ! isChanged, ajaxFinished: true } );

</span><span class="cx" style="display: block; padding: 0 10px">                                        }

</span><span class="cx" style="display: block; padding: 0 10px">                                } else {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // General error message

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // General error message.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         message = l10n.error;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                        if ( r.data && r.data.message ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1406,7 +1410,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                self.embedWidgetContent();

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // If the expanded state is unchanged only manipulate container expanded states

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // If the expanded state is unchanged only manipulate container expanded states.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( args.unchanged ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( expanded ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        api.Control.prototype.expand.call( self, {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1422,7 +1426,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        expandControl = function() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Close all other widget controls before expanding this one

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Close all other widget controls before expanding this one.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 api.control.each( function( otherControl ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        if ( self.params.type === otherControl.params.type && self !== otherControl ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                otherControl.collapse();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1535,7 +1539,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        i = this.getWidgetSidebarPosition();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        sidebarWidgetsSetting = this.getSidebarWidgetsControl().setting;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        sidebarWidgetIds = Array.prototype.slice.call( sidebarWidgetsSetting() ); // clone

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 sidebarWidgetIds = Array.prototype.slice.call( sidebarWidgetsSetting() ); // Clone.

</ins><span class="cx" style="display: block; padding: 0 10px">                         adjacentWidgetId = sidebarWidgetIds[i + offset];

</span><span class="cx" style="display: block; padding: 0 10px">                        sidebarWidgetIds[i + offset] = this.params.widget_id;

</span><span class="cx" style="display: block; padding: 0 10px">                        sidebarWidgetIds[i] = adjacentWidgetId;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1558,7 +1562,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 ( showOrHide ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // reset the selected sidebar

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Reset the selected sidebar.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $moveWidgetArea.find( '.selected' ).removeClass( 'selected' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                $moveWidgetArea.find( 'li' ).filter( function() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1781,7 +1785,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                removedWidgetIds = _( oldWidgetIds ).difference( newWidgetIds );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Filter out any persistent widget IDs for widgets which have been deactivated

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Filter out any persistent widget IDs for widgets which have been deactivated.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 newWidgetIds = _( newWidgetIds ).filter( function( newWidgetId ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        var parsedWidgetId = parseWidgetId( newWidgetId );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1798,7 +1802,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        return widgetFormControl;

</span><span class="cx" style="display: block; padding: 0 10px">                                } );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Sort widget controls to their new positions

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Sort widget controls to their new positions.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 widgetFormControls.sort( function( a, b ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        var aIndex = _.indexOf( newWidgetIds, a.params.widget_id ),

</span><span class="cx" style="display: block; padding: 0 10px">                                                bIndex = _.indexOf( newWidgetIds, b.params.widget_id );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1811,25 +1815,26 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        control.section( self.section() );

</span><span class="cx" style="display: block; padding: 0 10px">                                        priority += 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">-                                self.priority( priority ); // Make sure sidebar control remains at end

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         self.priority( priority ); // Make sure sidebar control remains at end.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Re-sort widget form controls (including widgets form other sidebars newly moved here)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Re-sort widget form controls (including widgets form other sidebars newly moved here).

</ins><span class="cx" style="display: block; padding: 0 10px">                                 self._applyCardinalOrderClassNames();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // If the widget was dragged into the sidebar, make sure the sidebar_id param is updated

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // If the widget was dragged into the sidebar, make sure the sidebar_id param is updated.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 _( widgetFormControls ).each( function( widgetFormControl ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        widgetFormControl.params.sidebar_id = self.params.sidebar_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">-                                // Cleanup after widget removal

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Cleanup after widget removal.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 _( removedWidgetIds ).each( function( removedWidgetId ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Using setTimeout so that when moving a widget to another sidebar, the other sidebars_widgets settings get a chance to update

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Using setTimeout so that when moving a widget to another sidebar,

+                                       // the other sidebars_widgets settings get a chance to update.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         setTimeout( function() {

</span><span class="cx" style="display: block; padding: 0 10px">                                                var removedControl, wasDraggedToAnotherSidebar, inactiveWidgets, removedIdBase,

</span><span class="cx" style="display: block; padding: 0 10px">                                                        widget, isPresentInAnotherSidebar = 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">-                                                // Check if the widget is in another sidebar

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         // Check if the widget is in another sidebar.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                 api.each( function( otherSetting ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                        if ( otherSetting.id === self.setting.id || 0 !== otherSetting.id.indexOf( 'sidebars_widgets[' ) || otherSetting.id === 'sidebars_widgets[wp_inactive_widgets]' ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                                return;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1850,17 +1855,17 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                                removedControl = api.Widgets.getWidgetFormControlForWidget( removedWidgetId );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                // Detect if widget control was dragged to another sidebar

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         // Detect if widget control was dragged to another sidebar.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                 wasDraggedToAnotherSidebar = removedControl && $.contains( document, removedControl.container[0] ) && ! $.contains( self.$sectionContent[0], removedControl.container[0] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                // Delete any widget form controls for removed widgets

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         // Delete any widget form controls for removed widgets.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                 if ( removedControl && ! wasDraggedToAnotherSidebar ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                        api.control.remove( removedControl.id );

</span><span class="cx" style="display: block; padding: 0 10px">                                                        removedControl.container.remove();

</span><span class="cx" style="display: block; padding: 0 10px">                                                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                // Move widget to inactive widgets sidebar (move it to trash) if has been previously saved

-                                               // This prevents the inactive widgets sidebar from overflowing with throwaway widgets

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         // Move widget to inactive widgets sidebar (move it to trash) if has been previously saved.

+                                               // This prevents the inactive widgets sidebar from overflowing with throwaway widgets.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                 if ( api.Widgets.savedWidgetIds[removedWidgetId] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                        inactiveWidgets = api.value( 'sidebars_widgets[wp_inactive_widgets]' )().slice();

</span><span class="cx" style="display: block; padding: 0 10px">                                                        inactiveWidgets.push( removedWidgetId );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1867,7 +1872,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                                        api.value( 'sidebars_widgets[wp_inactive_widgets]' )( _( inactiveWidgets ).unique() );

</span><span class="cx" style="display: block; padding: 0 10px">                                                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                // Make old single widget available for adding again

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         // Make old single widget available for adding again.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                 removedIdBase = parseWidgetId( removedWidgetId ).id_base;

</span><span class="cx" style="display: block; padding: 0 10px">                                                widget = api.Widgets.availableWidgets.findWhere( { id_base: removedIdBase } );

</span><span class="cx" style="display: block; padding: 0 10px">                                                if ( widget && ! widget.get( 'is_multi' ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1916,9 +1921,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                over: function() {

</span><span class="cx" style="display: block; padding: 0 10px">                                        var section = api.section( self.section.get() );

</span><span class="cx" style="display: block; padding: 0 10px">                                        section.expand({

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                allowMultiple: true, // Prevent the section being dragged from to be collapsed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         allowMultiple: true, // Prevent the section being dragged from to be collapsed.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                 completeCallback: function () {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                        // @todo It is not clear when refreshPositions should be called on which sections, or if it is even needed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 // @todo It is not clear when refreshPositions should be called on which sections, or if it is even needed.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                         api.section.each( function ( otherSection ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                                if ( otherSection.container.find( '.customize-control-sidebar_widgets' ).length ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                                        otherSection.container.find( '.accordion-section-content:first' ).sortable( 'refreshPositions' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2079,7 +2084,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">-                        // Set up new multi widget

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Set up new multi widget.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( widget.get( 'is_multi' ) && ! widgetNumber ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                widget.set( 'multi_number', widget.get( 'multi_number' ) + 1 );

</span><span class="cx" style="display: block; padding: 0 10px">                                widgetNumber = widget.get( 'multi_number' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2091,7 +2096,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        return m.replace( /__i__|%i%/g, widgetNumber );

</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">-                                widget.set( 'is_disabled', true ); // Prevent single widget from being added again now

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         widget.set( 'is_disabled', true ); // Prevent single widget from being added again now.

</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">                        $widget = $( controlHtml );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2101,7 +2106,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                .addClass( 'customize-control-' + controlType )

</span><span class="cx" style="display: block; padding: 0 10px">                                .append( $widget );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Remove icon which is visible inside the panel

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Remove icon which is visible inside the panel.

</ins><span class="cx" style="display: block; padding: 0 10px">                         controlContainer.find( '> .widget-icon' ).remove();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( widget.get( 'is_multi' ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2111,7 +2116,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        widgetId = controlContainer.find( '[name="widget-id"]' ).val();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        controlContainer.hide(); // to be slid-down below

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 controlContainer.hide(); // To be slid-down below.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        settingId = 'widget_' + widget.get( 'id_base' );

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( widget.get( 'is_multi' ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2119,7 +2124,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                        controlContainer.attr( 'id', 'customize-control-' + settingId.replace( /\]/g, '' ).replace( /\[/g, '-' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Only create setting if it doesn't already exist (if we're adding a pre-existing inactive widget)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Only create setting if it doesn't already exist (if we're adding a pre-existing inactive widget).

</ins><span class="cx" style="display: block; padding: 0 10px">                         isExistingWidget = api.has( settingId );

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! isExistingWidget ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                settingArgs = {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2127,7 +2132,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        previewer: this.setting.previewer

</span><span class="cx" style="display: block; padding: 0 10px">                                };

</span><span class="cx" style="display: block; padding: 0 10px">                                setting = api.create( settingId, settingId, '', settingArgs );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                setting.set( {} ); // mark dirty, changing from '' to {}

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         setting.set( {} ); // Mark dirty, changing from '' to {}.

</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">                        controlConstructor = api.controlConstructor[controlType];

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2147,7 +2152,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        } );

</span><span class="cx" style="display: block; padding: 0 10px">                        api.control.add( widgetFormControl );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Make sure widget is removed from the other sidebars

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Make sure widget is removed from the other sidebars.

</ins><span class="cx" style="display: block; padding: 0 10px">                         api.each( function( otherSetting ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( otherSetting.id === self.setting.id ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        return;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2166,7 +2171,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">-                        // Add widget to this sidebar

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Add widget to this sidebar.

</ins><span class="cx" style="display: block; padding: 0 10px">                         sidebarWidgets = this.setting().slice();

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( -1 === _.indexOf( sidebarWidgets, widgetId ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                sidebarWidgets.push( widgetId );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2185,7 +2190,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">-        // Register models for custom panel, section, and control types

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Register models for custom panel, section, and control types.

</ins><span class="cx" style="display: block; padding: 0 10px">         $.extend( api.panelConstructor, {

</span><span class="cx" style="display: block; padding: 0 10px">                widgets: api.Widgets.WidgetsPanel

</span><span class="cx" style="display: block; padding: 0 10px">        });

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2201,15 +2206,15 @@

<span class="cx" style="display: block; padding: 0 10px">         * Init Customizer for widgets.

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        api.bind( 'ready', function() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set up the widgets panel

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set up the widgets panel.

</ins><span class="cx" style="display: block; padding: 0 10px">                 api.Widgets.availableWidgetsPanel = new api.Widgets.AvailableWidgetsPanelView({

</span><span class="cx" style="display: block; padding: 0 10px">                        collection: api.Widgets.availableWidgets

</span><span class="cx" style="display: block; padding: 0 10px">                });

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Highlight widget control

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Highlight widget control.

</ins><span class="cx" style="display: block; padding: 0 10px">                 api.previewer.bind( 'highlight-widget-control', api.Widgets.highlightWidgetFormControl );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Open and focus widget control

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Open and focus widget control.

</ins><span class="cx" style="display: block; padding: 0 10px">                 api.previewer.bind( 'focus-widget-control', api.Widgets.focusWidgetFormControl );

</span><span class="cx" style="display: block; padding: 0 10px">        } );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2247,7 +2252,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        api.Widgets.getSidebarWidgetControlContainingWidget = function( widgetId ) {

</span><span class="cx" style="display: block; padding: 0 10px">                var foundControl = null;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // @todo this can use widgetIdToSettingId(), then pass into wp.customize.control( x ).getSidebarWidgetsControl()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // @todo This can use widgetIdToSettingId(), then pass into wp.customize.control( x ).getSidebarWidgetsControl().

</ins><span class="cx" style="display: block; padding: 0 10px">                 api.control.each( function( control ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( control.params.type === 'sidebar_widgets' && -1 !== _.indexOf( control.setting(), widgetId ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                foundControl = control;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2266,7 +2271,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        api.Widgets.getWidgetFormControlForWidget = function( widgetId ) {

</span><span class="cx" style="display: block; padding: 0 10px">                var foundControl = null;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // @todo We can just use widgetIdToSettingId() here

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // @todo We can just use widgetIdToSettingId() here.

</ins><span class="cx" style="display: block; padding: 0 10px">                 api.control.each( function( control ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( control.params.type === 'widget_form' && control.params.widget_id === widgetId ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                foundControl = control;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2343,7 +2348,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        parsed.id_base = matches[1];

</span><span class="cx" style="display: block; padding: 0 10px">                        parsed.number = parseInt( matches[2], 10 );

</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">-                        // likely an old single widget

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Likely an old single widget.

</ins><span class="cx" style="display: block; padding: 0 10px">                         parsed.id_base = widgetId;

</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="trunksrcjs_enqueueswpeditorbasejs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/wp/editor/base.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/wp/editor/base.js  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/wp/editor/base.js    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -112,7 +112,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( keepSelection ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Save the selection

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Save the selection.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         addHTMLBookmarkInTextAreaContent( $textarea );

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -131,7 +131,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                        if ( editor.getParam( 'wp_keep_scroll_position' ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                // Restore the selection

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         // Restore the selection.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                 focusHTMLBookmarkInVisualEditor( editor );

</span><span class="cx" style="display: block; padding: 0 10px">                                        }

</span><span class="cx" style="display: block; padding: 0 10px">                                } else {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -149,7 +149,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 ( editor ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Don't resize the textarea in iOS. The iframe is forced to 100% height there, we shouldn't match it.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Don't resize the textarea in iOS.

+                                       // The iframe is forced to 100% height there, we shouldn't match it.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         if ( ! tinymce.Env.iOS ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                iframe = editor.iframeElement;

</span><span class="cx" style="display: block; padding: 0 10px">                                                editorHeight = iframe ? parseInt( iframe.style.height, 10 ) : 0;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -177,7 +178,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                                selectTextInTextArea( editor, selectionRange );

</span><span class="cx" style="display: block; padding: 0 10px">                                        }

</span><span class="cx" style="display: block; padding: 0 10px">                                } else {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // There is probably a JS error on the page. The TinyMCE editor instance doesn't exist. Show the textarea.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // There is probably a JS error on the page.

+                                       // The TinyMCE editor instance doesn't exist. Show the textarea.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         $textarea.css({ 'display': '', 'visibility': '' });

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -209,7 +211,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                lastGtPos = content.lastIndexOf( '>', cursorPosition );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( lastLtPos > lastGtPos || content.substr( cursorPosition, 1 ) === '>' ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // find what the tag is

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Find what the tag is.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 var tagContent = content.substr( lastLtPos ),

</span><span class="cx" style="display: block; padding: 0 10px">                                        tagMatch = tagContent.match( /<\s*(\/)?(\w+|\!-{2}.*-{2})/ );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -222,7 +224,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                return {

</span><span class="cx" style="display: block; padding: 0 10px">                                        ltPos: lastLtPos,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        gtPos: lastLtPos + closingGt + 1, // offset by one to get the position _after_ the character,

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 gtPos: lastLtPos + closingGt + 1, // Offset by one to get the position _after_ the character.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         tagType: tagType,

</span><span class="cx" style="display: block; padding: 0 10px">                                        isClosingTag: !! tagMatch[1]

</span><span class="cx" style="display: block; padding: 0 10px">                                };

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -248,7 +250,7 @@

<span class="cx" style="display: block; padding: 0 10px">                 * @param {number} cursorPosition    The cursor position to check.

</span><span class="cx" style="display: block; padding: 0 10px">                 *

<span class="cx" style="display: block; padding: 0 10px">                 * @return {(undefined|Object)} Undefined if the cursor is not wrapped in a shortcode tag.

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 *                                Information about the wrapping shortcode tag if it's wrapped in one.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+          *                              Information about the wrapping shortcode tag if it's wrapped in one.

</ins><span class="cx" style="display: block; padding: 0 10px">                  */

</span><span class="cx" style="display: block; padding: 0 10px">                function getShortcodeWrapperInfo( content, cursorPosition ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        var contentShortcodes = getShortCodePositionsInText( content );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -403,7 +405,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        var cursorStart = cursorPositions.cursorStart,

</span><span class="cx" style="display: block; padding: 0 10px">                                cursorEnd = cursorPositions.cursorEnd,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // check if the cursor is in a tag and if so, adjust it

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Check if the cursor is in a tag and if so, adjust it.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 isCursorStartInTag = getContainingTagInfo( content, cursorStart );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( isCursorStartInTag ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -506,11 +508,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        textArea.value = [

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                textArea.value.slice( 0, htmlModeCursorStartPosition ), // text until the cursor/selection position

-                               cursorMarkerSkeleton.clone()                                                    // cursor/selection start marker

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         textArea.value.slice( 0, htmlModeCursorStartPosition ), // Text until the cursor/selection position.

+                               cursorMarkerSkeleton.clone()                                                    // Cursor/selection start marker.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         .addClass( 'mce_SELRES_start' )[0].outerHTML,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                selectedText,                                                                                   // selected text with end cursor/position marker

-                               textArea.value.slice( htmlModeCursorEndPosition )               // text from last cursor/selection position to end

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         selectedText,                                                                                   // Selected text with end cursor/position marker.

+                               textArea.value.slice( htmlModeCursorEndPosition )               // Text from last cursor/selection position to end.

</ins><span class="cx" style="display: block; padding: 0 10px">                         ].join( '' );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -804,7 +806,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        endMatchIndex -= endMatch[1].length;

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // We need to adjust the end position to discard the length of the range start marker

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // We need to adjust the end position to discard the length of the range start marker.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 endIndex = endMatchIndex - startMatchLength;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -826,7 +828,7 @@

<span class="cx" style="display: block; padding: 0 10px">                 * @param {Object} selection Selection data.

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                function selectTextInTextArea( editor, selection ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // only valid in the text area mode and if we have selection

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Only valid in the text area mode and if we have selection.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( ! selection ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                return;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -836,11 +838,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                end = selection.end || selection.start;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( textArea.focus ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Wait for the Visual editor to be hidden, then focus and scroll to the position

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Wait for the Visual editor to be hidden, then focus and scroll to the position.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 setTimeout( function() {

</span><span class="cx" style="display: block; padding: 0 10px">                                        textArea.setSelectionRange( start, end );

</span><span class="cx" style="display: block; padding: 0 10px">                                        if ( textArea.blur ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                // defocus before focusing

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         // Defocus before focusing.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                 textArea.blur();

</span><span class="cx" style="display: block; padding: 0 10px">                                        }

</span><span class="cx" style="display: block; padding: 0 10px">                                        textArea.focus();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1249,7 +1251,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                defaults = wp.editor.getDefaultSettings();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Initialize TinyMCE by default

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Initialize TinyMCE by default.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! settings ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        settings = {

</span><span class="cx" style="display: block; padding: 0 10px">                                tinymce: true

</span></span></pre></div>

<a id="trunksrcjs_enqueueswpeditordfwjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/wp/editor/dfw.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/wp/editor/dfw.js   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/wp/editor/dfw.js     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -246,10 +246,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        function mceKeyup( event ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                var key = event.keyCode;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Bail on special keys. Key code 47 is a /

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Bail on special keys. Key code 47 is a '/'.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( key <= 47 && ! ( key === VK.SPACEBAR || key === VK.ENTER || key === VK.DELETE || key === VK.BACKSPACE || key === VK.UP || key === VK.LEFT || key === VK.DOWN || key === VK.UP ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        return;

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // OS keys, function keys, num lock, scroll lock. Key code 91-93 are OS keys. Key code 112-123 are F1 to F12. Key code 144 is num lock. Key code 145 is scroll lock.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // OS keys, function keys, num lock, scroll lock. Key code 91-93 are OS keys.

+                               // Key code 112-123 are F1 to F12. Key code 144 is num lock. Key code 145 is scroll lock.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 } else if ( ( key >= 91 && key <= 93 ) || ( key >= 112 && key <= 123 ) || key === 144 || key === 145 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        return;

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -516,7 +517,7 @@

<span class="cx" style="display: block; padding: 0 10px">                         * If in visual mode, checks if the editorHeight is greater than the autoresizeMinHeight + topHeight.

<span class="cx" style="display: block; padding: 0 10px">                         * If not in visual mode, checks if the editorHeight is greater than the autoresizeMinHeight + 20.

</span><span class="cx" style="display: block; padding: 0 10px">                         */

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        canPin = visual ? autoresizeMinHeight + topHeight : autoresizeMinHeight + 20; // 20px from textarea padding

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 canPin = visual ? autoresizeMinHeight + topHeight : autoresizeMinHeight + 20; // 20px from textarea padding.

</ins><span class="cx" style="display: block; padding: 0 10px">                         canPin = editorHeight > ( canPin + 5 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! canPin ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -910,7 +911,7 @@

<span class="cx" style="display: block; padding: 0 10px">                        // Adjust when entering or exiting fullscreen mode.

</span><span class="cx" style="display: block; padding: 0 10px">                        fullscreen && fullscreen.pubsub.unsubscribe( 'hidden', fullscreenHide );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Reset all css

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Reset all CSS.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $.each( [ $visualTop, $textTop, $tools, $menuBar, $bottom, $statusBar, $contentWrap, $visualEditor, $textEditor, $sideSortables ], function( i, element ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                element && element.attr( 'style', '' );

</span><span class="cx" style="display: block; padding: 0 10px">                        });

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1179,15 +1180,15 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                        // Return if any of the following keys or combinations of keys is pressed.

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( event && ( event.metaKey || ( event.ctrlKey && ! event.altKey ) || ( event.altKey && event.shiftKey ) || ( key && (

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Special keys ( tab, ctrl, alt, esc, arrow keys... )

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Special keys ( tab, ctrl, alt, esc, arrow keys... ).

</ins><span class="cx" style="display: block; padding: 0 10px">                                 ( key <= 47 && key !== 8 && key !== 13 && key !== 32 && key !== 46 ) ||

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Windows keys

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Windows keys.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 ( key >= 91 && key <= 93 ) ||

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // F keys

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // F keys.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 ( key >= 112 && key <= 135 ) ||

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Num Lock, Scroll Lock, OEM

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Num Lock, Scroll Lock, OEM.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 ( key >= 144 && key <= 150 ) ||

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // OEM or non-printable

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // OEM or non-printable.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 key >= 224

</span><span class="cx" style="display: block; padding: 0 10px">                        ) ) ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                return;

</span></span></pre></div>

<a id="trunksrcjs_enqueueswpemojijs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/wp/emoji.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/wp/emoji.js        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/wp/emoji.js  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,8 +9,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Replaces emoji with images when browsers don't support emoji.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since      4.2.0

-        * @access     private

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @since 4.2.0

+        * @access private

</ins><span class="cx" style="display: block; padding: 0 10px">          *

</span><span class="cx" style="display: block; padding: 0 10px">         * @class

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,10 +22,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function wpEmoji() {

</span><span class="cx" style="display: block; padding: 0 10px">                var MutationObserver = window.MutationObserver || window.WebKitMutationObserver || window.MozMutationObserver,

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Compression and maintain local scope

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Compression and maintain local scope.

</ins><span class="cx" style="display: block; padding: 0 10px">                 document = window.document,

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Private

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Private.

</ins><span class="cx" style="display: block; padding: 0 10px">                 twemoji, timer,

</span><span class="cx" style="display: block; padding: 0 10px">                loaded = false,

</span><span class="cx" style="display: block; padding: 0 10px">                count = 0,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -69,7 +69,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                        // Ensure twemoji is available on the global window before proceeding.

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( typeof window.twemoji === 'undefined' ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Break if waiting for longer than 30 sec.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Break if waiting for longer than 30 seconds.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( count > 600 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        return;

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -245,8 +245,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 ( settings.supports.everythingExceptFlag &&

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                ! /^1f1(?:e[6-9a-f]|f[0-9a-f])-1f1(?:e[6-9a-f]|f[0-9a-f])$/.test( icon ) && // Country flags

-                                               ! /^(1f3f3-fe0f-200d-1f308|1f3f4-200d-2620-fe0f)$/.test( icon )             // Rainbow and pirate flags

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         ! /^1f1(?:e[6-9a-f]|f[0-9a-f])-1f1(?:e[6-9a-f]|f[0-9a-f])$/.test( icon ) && // Country flags.

+                                               ! /^(1f3f3-fe0f-200d-1f308|1f3f4-200d-2620-fe0f)$/.test( icon )             // Rainbow and pirate flags.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         ) {

</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="trunksrcjs_enqueueswpheartbeatjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/wp/heartbeat.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/wp/heartbeat.js    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/wp/heartbeat.js      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,7 +62,7 @@

<span class="cx" style="display: block; padding: 0 10px">                                // Connect interval (in seconds).

</span><span class="cx" style="display: block; padding: 0 10px">                                mainInterval: 60,

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Used when the interval is set to 5 sec. temporarily.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Used when the interval is set to 5 seconds temporarily.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 tempInterval: 0,

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                                // Used when the interval is reset.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -89,7 +89,7 @@

<span class="cx" style="display: block; padding: 0 10px">                                // Whether the current browser window is in focus and the user is active.

</span><span class="cx" style="display: block; padding: 0 10px">                                hasFocus: true,

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Timestamp, last time the user was active. Checked every 30 sec.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Timestamp, last time the user was active. Checked every 30 seconds.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 userActivity: 0,

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                                // Flag whether events tracking user activity were set.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,10 +106,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                /**

<span class="cx" style="display: block; padding: 0 10px">                 * Sets local variables and events, then starts the heartbeat.

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 * @since 3.8.0

</ins><span class="cx" style="display: block; padding: 0 10px">                  * @access private

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 * @since 3.8.0

-                *

</del><span class="cx" style="display: block; padding: 0 10px">                  * @return {void}

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                function initialize() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -133,9 +132,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">                                /*

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                 * The interval can be from 15 to 120 sec. and can be set temporarily to 5 sec.

-                                * It can be set in the initial options or changed later through JS and/or

-                                * through PHP.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                          * The interval can be from 15 to 120 seconds and can be set temporarily to 5 seconds.

+                                * It can be set in the initial options or changed later through JS and/or through PHP.

</ins><span class="cx" style="display: block; padding: 0 10px">                                  */

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( options.interval ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        settings.mainInterval = options.interval;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -148,12 +146,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                /*

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                 * Used to limit the number of AJAX requests. Overrides all other intervals if

-                                * they are shorter. Needed for some hosts that cannot handle frequent requests

-                                * and the user may exceed the allocated server CPU time, etc. The minimal

-                                * interval can be up to 600 sec. however setting it to longer than 120 sec.

-                                * will limit or disable some of the functionality (like post locks). Once set

-                                * at initialization, minimalInterval cannot be changed/overridden.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                          * Used to limit the number of AJAX requests. Overrides all other intervals

+                                * if they are shorter. Needed for some hosts that cannot handle frequent requests

+                                * and the user may exceed the allocated server CPU time, etc. The minimal interval

+                                * can be up to 600 seconds, however setting it to longer than 120 seconds

+                                * will limit or disable some of the functionality (like post locks).

+                                * Once set at initialization, minimalInterval cannot be changed/overridden.

</ins><span class="cx" style="display: block; padding: 0 10px">                                  */

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( options.minimalInterval ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        options.minimalInterval = parseInt( options.minimalInterval, 10 );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -189,11 +187,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                hidden = 'hidden';

</span><span class="cx" style="display: block; padding: 0 10px">                                visibilitychange = 'visibilitychange';

</span><span class="cx" style="display: block; padding: 0 10px">                                visibilityState = 'visibilityState';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        } else if ( typeof document.msHidden !== 'undefined' ) { // IE10

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 } else if ( typeof document.msHidden !== 'undefined' ) { // IE10.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 hidden = 'msHidden';

</span><span class="cx" style="display: block; padding: 0 10px">                                visibilitychange = 'msvisibilitychange';

</span><span class="cx" style="display: block; padding: 0 10px">                                visibilityState = 'msVisibilityState';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        } else if ( typeof document.webkitHidden !== 'undefined' ) { // Android

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 } else if ( typeof document.webkitHidden !== 'undefined' ) { // Android.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 hidden = 'webkitHidden';

</span><span class="cx" style="display: block; padding: 0 10px">                                visibilitychange = 'webkitvisibilitychange';

</span><span class="cx" style="display: block; padding: 0 10px">                                visibilityState = 'webkitVisibilityState';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -245,10 +243,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                /**

<span class="cx" style="display: block; padding: 0 10px">                 * Returns the current time according to the browser.

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 * @since 3.6.0

</ins><span class="cx" style="display: block; padding: 0 10px">                  * @access private

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 * @since 3.6.0

-                *

</del><span class="cx" style="display: block; padding: 0 10px">                  * @return {number} Returns the current time.

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                function time() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -258,10 +255,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                /**

<span class="cx" style="display: block; padding: 0 10px">                 * Checks if the iframe is from the same origin.

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 * @since 3.6.0

</ins><span class="cx" style="display: block; padding: 0 10px">                  * @access private

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 * @since 3.6.0

-                *

</del><span class="cx" style="display: block; padding: 0 10px">                  * @return {boolean} Returns whether or not the iframe is from the same origin.

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                function isLocalFrame( frame ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -291,10 +287,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                /**

<span class="cx" style="display: block; padding: 0 10px">                 * Checks if the document's focus has changed.

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 * @since 4.1.0

</ins><span class="cx" style="display: block; padding: 0 10px">                  * @access private

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 * @since 4.1.0

-                *

</del><span class="cx" style="display: block; padding: 0 10px">                  * @return {void}

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                function checkFocus() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -308,10 +303,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                /**

<span class="cx" style="display: block; padding: 0 10px">                 * Sets error state and fires an event on XHR errors or timeout.

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 * @since 3.8.0

</ins><span class="cx" style="display: block; padding: 0 10px">                  * @access private

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 * @since 3.8.0

-                *

</del><span class="cx" style="display: block; padding: 0 10px">                  * @param {string} error  The error type passed from the XHR.

</span><span class="cx" style="display: block; padding: 0 10px">                 * @param {number} status The HTTP status code passed from jqXHR

</span><span class="cx" style="display: block; padding: 0 10px">                 *                        (200, 404, 500, etc.).

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -327,7 +321,7 @@

<span class="cx" style="display: block; padding: 0 10px">                                                // Do nothing.

</span><span class="cx" style="display: block; padding: 0 10px">                                                break;

</span><span class="cx" style="display: block; padding: 0 10px">                                        case 'timeout':

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                // No response for 30 sec.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         // No response for 30 seconds.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                 trigger = true;

</span><span class="cx" style="display: block; padding: 0 10px">                                                break;

</span><span class="cx" style="display: block; padding: 0 10px">                                        case 'error':

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -359,10 +353,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                /**

<span class="cx" style="display: block; padding: 0 10px">                 * Clears the error state and fires an event if there is a connection error.

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 * @since 3.8.0

</ins><span class="cx" style="display: block; padding: 0 10px">                  * @access private

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 * @since 3.8.0

-                *

</del><span class="cx" style="display: block; padding: 0 10px">                  * @return {void}

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                function clearErrorState() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -380,10 +373,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                /**

<span class="cx" style="display: block; padding: 0 10px">                 * Gathers the data and connects to the server.

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 * @since 3.6.0

</ins><span class="cx" style="display: block; padding: 0 10px">                  * @access private

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 * @since 3.6.0

-                *

</del><span class="cx" style="display: block; padding: 0 10px">                  * @return {void}

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                function connect() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -421,7 +413,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        settings.xhr = $.ajax({

</span><span class="cx" style="display: block; padding: 0 10px">                                url: settings.url,

</span><span class="cx" style="display: block; padding: 0 10px">                                type: 'post',

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                timeout: 30000, // throw an error if not completed after 30 sec.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         timeout: 30000, // Throw an error if not completed after 30 seconds.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 data: ajaxData,

</span><span class="cx" style="display: block; padding: 0 10px">                                dataType: 'json'

</span><span class="cx" style="display: block; padding: 0 10px">                        }).always( function() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -442,7 +434,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        wp.hooks.doAction( 'heartbeat.nonces-expired' );

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Change the interval from PHP

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Change the interval from PHP.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( response.heartbeat_interval ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        newInterval = response.heartbeat_interval;

</span><span class="cx" style="display: block; padding: 0 10px">                                        delete response.heartbeat_interval;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -464,7 +456,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                $document.trigger( 'heartbeat-tick', [response, textStatus, jqXHR] );

</span><span class="cx" style="display: block; padding: 0 10px">                                wp.hooks.doAction( 'heartbeat.tick', response, textStatus, jqXHR );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Do this last. Can trigger the next XHR if connection time > 5 sec. and newInterval == 'fast'.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Do this last. Can trigger the next XHR if connection time > 5 seconds and newInterval == 'fast'.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( newInterval ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        interval( newInterval );

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -480,10 +472,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                 *

<span class="cx" style="display: block; padding: 0 10px">                 * Fires immediately if the connection time is longer than the interval.

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 * @since 3.8.0

</ins><span class="cx" style="display: block; padding: 0 10px">                  * @access private

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 * @since 3.8.0

-                *

</del><span class="cx" style="display: block; padding: 0 10px">                  * @return {void}

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                function scheduleNextTick() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -495,7 +486,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 ( ! settings.hasFocus ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                interval = 120000; // 120 sec. Post locks expire after 150 sec.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         interval = 120000; // 120 seconds. Post locks expire after 150 seconds.

</ins><span class="cx" style="display: block; padding: 0 10px">                         } else if ( settings.countdown > 0 && settings.tempInterval ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                interval = settings.tempInterval;

</span><span class="cx" style="display: block; padding: 0 10px">                                settings.countdown--;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -526,10 +517,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                /**

<span class="cx" style="display: block; padding: 0 10px">                 * Sets the internal state when the browser window becomes hidden or loses focus.

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 * @since 3.6.0

</ins><span class="cx" style="display: block; padding: 0 10px">                  * @access private

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 * @since 3.6.0

-                *

</del><span class="cx" style="display: block; padding: 0 10px">                  * @return {void}

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                function blurred() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -539,16 +529,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">                /**

<span class="cx" style="display: block; padding: 0 10px">                 * Sets the internal state when the browser window becomes visible or is in focus.

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 * @since 3.6.0

</ins><span class="cx" style="display: block; padding: 0 10px">                  * @access private

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 * @since 3.6.0

-                *

</del><span class="cx" style="display: block; padding: 0 10px">                  * @return {void}

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                function focused() {

</span><span class="cx" style="display: block; padding: 0 10px">                        settings.userActivity = time();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Resume if suspended

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Resume if suspended.

</ins><span class="cx" style="display: block; padding: 0 10px">                         settings.suspend = false;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! settings.hasFocus ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -560,10 +549,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                /**

<span class="cx" style="display: block; padding: 0 10px">                 * Runs when the user becomes active after a period of inactivity.

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 * @since 3.6.0

</ins><span class="cx" style="display: block; padding: 0 10px">                  * @access private

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 * @since 3.6.0

-                *

</del><span class="cx" style="display: block; padding: 0 10px">                  * @return {void}

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                function userIsActive() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -582,26 +570,25 @@

</span><span class="cx" style="display: block; padding: 0 10px">                /**

<span class="cx" style="display: block; padding: 0 10px">                 * Checks for user activity.

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 * Runs every 30 sec. Sets 'hasFocus = true' if user is active and the window is

-                * in the background. Sets 'hasFocus = false' if the user has been inactive

-                * (no mouse or keyboard activity) for 5 min. even when the window has focus.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+          * Runs every 30 seconds. Sets 'hasFocus = true' if user is active and the window

+                * is in the background. Sets 'hasFocus = false' if the user has been inactive

+                * (no mouse or keyboard activity) for 5 minutes even when the window has focus.

</ins><span class="cx" style="display: block; padding: 0 10px">                  *

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 * @since 3.8.0

</ins><span class="cx" style="display: block; padding: 0 10px">                  * @access private

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 * @since 3.8.0

-                *

</del><span class="cx" style="display: block; padding: 0 10px">                  * @return {void}

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                function checkUserActivity() {

</span><span class="cx" style="display: block; padding: 0 10px">                        var lastActive = settings.userActivity ? time() - settings.userActivity : 0;

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Throttle down when no mouse or keyboard activity for 5 min.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Throttle down when no mouse or keyboard activity for 5 minutes.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( lastActive > 300000 && settings.hasFocus ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                blurred();

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Suspend after 10 min. of inactivity when suspending is enabled.

-                       // Always suspend after 60 min. of inactivity. This will release the post lock, etc.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Suspend after 10 minutes of inactivity when suspending is enabled.

+                       // Always suspend after 60 minutes of inactivity. This will release the post lock, etc.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( ( settings.suspendEnabled && lastActive > 600000 ) || lastActive > 3600000 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                settings.suspend = true;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -672,9 +659,9 @@

<span class="cx" style="display: block; padding: 0 10px">                 * Disables suspending.

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><span class="cx" style="display: block; padding: 0 10px">                 * Should be used only when Heartbeat is performing critical tasks like

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 * autosave, post-locking, etc. Using this on many screens may overload the

-                * user's hosting account if several browser windows/tabs are left open for a

-                * long time.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+          * autosave, post-locking, etc. Using this on many screens may overload

+                * the user's hosting account if several browser windows/tabs are left open

+                * for a long time.

</ins><span class="cx" style="display: block; padding: 0 10px">                  *

</span><span class="cx" style="display: block; padding: 0 10px">                 * @since 3.8.0

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -691,15 +678,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><span class="cx" style="display: block; padding: 0 10px">                 * When setting to 'fast' or 5, the interval is 5 seconds for the next 30 ticks

</span><span class="cx" style="display: block; padding: 0 10px">                 * (for 2 minutes and 30 seconds) by default. In this case the number of 'ticks'

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 * can be passed as second argument. If the window doesn't have focus, the

-                * interval slows down to 2 min.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+          * can be passed as second argument. If the window doesn't have focus,

+                * the interval slows down to 2 minutes.

</ins><span class="cx" style="display: block; padding: 0 10px">                  *

</span><span class="cx" style="display: block; padding: 0 10px">                 * @since 3.6.0

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><span class="cx" style="display: block; padding: 0 10px">                 * @memberOf wp.heartbeat.prototype

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 * @param {string|number} speed Interval: 'fast' or 5, 15, 30, 60, 120. Fast

-                *                              equals 5.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+          * @param {string|number} speed Interval: 'fast' or 5, 15, 30, 60, 120.

+                *                              Fast equals 5.

</ins><span class="cx" style="display: block; padding: 0 10px">                  * @param {string}        ticks Tells how many ticks before the interval reverts

</span><span class="cx" style="display: block; padding: 0 10px">                 *                              back. Used with speed = 'fast' or 5.

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -728,7 +715,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                                newInterval = 120000;

</span><span class="cx" style="display: block; padding: 0 10px">                                                break;

</span><span class="cx" style="display: block; padding: 0 10px">                                        case 'long-polling':

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                // Allow long polling, (experimental)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         // Allow long polling (experimental).

</ins><span class="cx" style="display: block; padding: 0 10px">                                                 settings.mainInterval = 0;

</span><span class="cx" style="display: block; padding: 0 10px">                                                return 0;

</span><span class="cx" style="display: block; padding: 0 10px">                                        default:

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -751,9 +738,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        settings.mainInterval = newInterval;

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Change the next connection time if new interval has been set.

-                               // Will connect immediately if the time since the last connection

-                               // is greater than the new interval.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         /*

+                                * Change the next connection time if new interval has been set.

+                                * Will connect immediately if the time since the last connection

+                                * is greater than the new interval.

+                                */

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( newInterval !== oldInterval ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        scheduleNextTick();

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span></span></pre></div>

<a id="trunksrcjs_enqueueswpmceviewjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/wp/mce-view.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/wp/mce-view.js     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/wp/mce-view.js       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -565,10 +565,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        dom.add( node, 'span', { 'class': 'wpview-end' } );

</span><span class="cx" style="display: block; padding: 0 10px">                                } );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Bail if the iframe node is not attached to the DOM.

-                               // Happens when the view is dragged in the editor.

-                               // There is a browser restriction when iframes are moved in the DOM. They get emptied.

-                               // The iframe will be rerendered after dropping the view node at the new location.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         /*

+                                * Bail if the iframe node is not attached to the DOM.

+                                * Happens when the view is dragged in the editor.

+                                * There is a browser restriction when iframes are moved in the DOM. They get emptied.

+                                * The iframe will be rerendered after dropping the view node at the new location.

+                                */

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( ! iframe.contentWindow ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        return;

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span></span></pre></div>

<a id="trunksrcjs_enqueueswpmediaaudiovideojs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/wp/media/audiovideo.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/wp/media/audiovideo.js     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/wp/media/audiovideo.js       2020-01-29 00:43:23 UTC (rev 47122)

</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">                        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">-                // invoke features cleanup

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Invoke features cleanup.

</ins><span class="cx" style="display: block; padding: 0 10px">                 for ( featureIndex in t.options.features ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        feature = t.options.features[featureIndex];

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( t['clean' + feature] ) {

</span></span></pre></div>

<a id="trunksrcjs_enqueueswpmediaeditorjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/wp/media/editor.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/wp/media/editor.js 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/wp/media/editor.js   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -430,9 +430,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        _.extend( attrs, attachments[this.tag].toJSON() );

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Convert all gallery shortcodes to use the `ids` property.

-                               // Ignore `post__in` and `post__not_in`; the attachments in

-                               // the collection will already reflect those properties.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         /*

+                                * Convert all gallery shortcodes to use the `ids` property.

+                                * Ignore `post__in` and `post__not_in`; the attachments in

+                                * the collection will already reflect those properties.

+                                */

</ins><span class="cx" style="display: block; padding: 0 10px">                                 attrs.ids = attachments.pluck('id');

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                                // Copy the `uploadedTo` post ID.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -670,7 +672,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                this.content.set( view );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // after bringing in the frame, load the actual editor via an ajax call

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // After bringing in the frame, load the actual editor via an Ajax call.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 view.loadEditor();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        }, this._frame );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -733,9 +735,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                wpActiveEditor = window.wpActiveEditor;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Delegate to the global `send_to_editor` if it exists.

-                       // This attempts to play nice with any themes/plugins that have

-                       // overridden the insert functionality.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 /*

+                        * Delegate to the global `send_to_editor` if it exists.

+                        * This attempts to play nice with any themes/plugins

+                        * that have overridden the insert functionality.

+                        */

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( window.send_to_editor ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                return window.send_to_editor.apply( this, arguments );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -780,7 +784,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                add: function( id, options ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        var workflow = this.get( 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">-                        // only add once: if exists return existing

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Only add once: if exists return existing.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( workflow ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                return workflow;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1016,7 +1020,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        workflow = this.get( 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">-                        // Redo workflow if state has changed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Redo workflow if state has changed.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( ! workflow || ( workflow.options && options.state !== workflow.options.state ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                workflow = this.add( id, options );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span></span></pre></div>

<a id="trunksrcjs_enqueueswpmediamodelsjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/wp/media/models.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/wp/media/models.js 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/wp/media/models.js   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -147,9 +147,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        maxHeight = dimensions.maxHeight,

</span><span class="cx" style="display: block; padding: 0 10px">                        constraint;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Compare ratios between the two values to determine which

-               // max to constrain by. If a max value doesn't exist, then the

-               // opposite side is the constraint.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /*

+                * Compare ratios between the two values to determine

+                * which max to constrain by. If a max value doesn't exist,

+                * then the opposite side is the constraint.

+                */

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! _.isUndefined( maxWidth ) && ! _.isUndefined( maxHeight ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        constraint = ( width / height > maxWidth / maxHeight ) ? 'width' : 'height';

</span><span class="cx" style="display: block; padding: 0 10px">                } else if ( _.isUndefined( maxHeight ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -236,7 +238,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">-// Clean up. Prevents mobile browsers caching

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Clean up. Prevents mobile browsers caching.

</ins><span class="cx" style="display: block; padding: 0 10px"> $(window).on('unload', function(){

</span><span class="cx" style="display: block; padding: 0 10px">        window.wp = null;

</span><span class="cx" style="display: block; padding: 0 10px"> });

</span></span></pre></div>

<a id="trunksrcjs_enqueueswpmediaviewsjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/wp/media/views.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/wp/media/views.js  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/wp/media/views.js    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,7 +18,7 @@

<span class="cx" style="display: block; padding: 0 10px"> // Copy the `post` setting over to the model settings.

</span><span class="cx" style="display: block; padding: 0 10px"> media.model.settings.post = media.view.settings.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">-// Check if the browser supports CSS 3.0 transitions

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Check if the browser supports CSS 3.0 transitions.

</ins><span class="cx" style="display: block; padding: 0 10px"> $.support.transition = (function(){

</span><span class="cx" style="display: block; padding: 0 10px">        var style = document.documentElement.style,

</span><span class="cx" style="display: block; padding: 0 10px">                transitions = {

</span></span></pre></div>

<a id="trunksrcjs_enqueueswpshortcodejs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/wp/shortcode.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/wp/shortcode.js    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/wp/shortcode.js      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,13 +13,15 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> (function(){

</span><span class="cx" style="display: block; padding: 0 10px">        wp.shortcode = {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // ### Find the next matching shortcode

-               //

-               // Given a shortcode `tag`, a block of `text`, and an optional starting

-               // `index`, returns the next matching shortcode or `undefined`.

-               //

-               // Shortcodes are formatted as an object that contains the match

-               // `content`, the matching `index`, and the parsed `shortcode` object.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /*

+                * ### Find the next matching shortcode.

+                *

+                * Given a shortcode `tag`, a block of `text`, and an optional starting

+                * `index`, returns the next matching shortcode or `undefined`.

+                *

+                * Shortcodes are formatted as an object that contains the match

+                * `content`, the matching `index`, and the parsed `shortcode` object.

+                */

</ins><span class="cx" style="display: block; padding: 0 10px">                 next: function( tag, text, index ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        var re = wp.shortcode.regexp( tag ),

</span><span class="cx" style="display: block; padding: 0 10px">                                match, result;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,15 +59,17 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        return result;

</span><span class="cx" style="display: block; padding: 0 10px">                },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // ### Replace matching shortcodes in a block of text

-               //

-               // Accepts a shortcode `tag`, content `text` to scan, and a `callback`

-               // to process the shortcode matches and return a replacement string.

-               // Returns the `text` with all shortcodes replaced.

-               //

-               // Shortcode matches are objects that contain the shortcode `tag`,

-               // a shortcode `attrs` object, the `content` between shortcode tags,

-               // and a boolean flag to indicate if the match was a `single` tag.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /*

+                * ### Replace matching shortcodes in a block of text.

+                *

+                * Accepts a shortcode `tag`, content `text` to scan, and a `callback`

+                * to process the shortcode matches and return a replacement string.

+                * Returns the `text` with all shortcodes replaced.

+                *

+                * Shortcode matches are objects that contain the shortcode `tag`,

+                * a shortcode `attrs` object, the `content` between shortcode tags,

+                * and a boolean flag to indicate if the match was a `single` tag.

+                */

</ins><span class="cx" style="display: block; padding: 0 10px">                 replace: function( tag, text, callback ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return text.replace( wp.shortcode.regexp( tag ), function( match, left, tag, attrs, slash, content, closing, right ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                // If both extra brackets exist, the shortcode has been

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,67 +87,75 @@

</span><span class="cx" style="display: 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">-                // ### Generate a string from shortcode parameters

-               //

-               // Creates a `wp.shortcode` instance and returns a string.

-               //

-               // Accepts the same `options` as the `wp.shortcode()` constructor,

-               // containing a `tag` string, a string or object of `attrs`, a boolean

-               // indicating whether to format the shortcode using a `single` tag, and a

-               // `content` string.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /*

+                * ### Generate a string from shortcode parameters.

+                *

+                * Creates a `wp.shortcode` instance and returns a string.

+                *

+                * Accepts the same `options` as the `wp.shortcode()` constructor,

+                * containing a `tag` string, a string or object of `attrs`, a boolean

+                * indicating whether to format the shortcode using a `single` tag, and a

+                * `content` string.

+                */

</ins><span class="cx" style="display: block; padding: 0 10px">                 string: function( options ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return new wp.shortcode( options ).string();

</span><span class="cx" style="display: block; padding: 0 10px">                },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // ### Generate a RegExp to identify a shortcode

-               //

-               // The base regex is functionally equivalent to the one found in

-               // `get_shortcode_regex()` in `wp-includes/shortcodes.php`.

-               //

-               // Capture groups:

-               //

-               // 1. An extra `[` to allow for escaping shortcodes with double `[[]]`

-               // 2. The shortcode name

-               // 3. The shortcode argument list

-               // 4. The self closing `/`

-               // 5. The content of a shortcode when it wraps some content.

-               // 6. The closing tag.

-               // 7. An extra `]` to allow for escaping shortcodes with double `[[]]`

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /*

+                * ### Generate a RegExp to identify a shortcode.

+                *

+                * The base regex is functionally equivalent to the one found in

+                * `get_shortcode_regex()` in `wp-includes/shortcodes.php`.

+                *

+                * Capture groups:

+                *

+                * 1. An extra `[` to allow for escaping shortcodes with double `[[]]`.

+                * 2. The shortcode name.

+                * 3. The shortcode argument list.

+                * 4. The self closing `/`.

+                * 5. The content of a shortcode when it wraps some content.

+                * 6. The closing tag.

+                * 7. An extra `]` to allow for escaping shortcodes with double `[[]]`.

+                */

</ins><span class="cx" style="display: block; padding: 0 10px">                 regexp: _.memoize( function( tag ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return new RegExp( '\\[(\\[?)(' + tag + ')(?![\\w-])([^\\]\\/]*(?:\\/(?!\\])[^\\]\\/]*)*?)(?:(\\/)\\]|\\](?:([^\\[]*(?:\\[(?!\\/\\2\\])[^\\[]*)*)(\\[\\/\\2\\]))?)(\\]?)', 'g' );

</span><span class="cx" style="display: 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">-                // ### Parse shortcode attributes

-               //

-               // Shortcodes accept many types of attributes. These can chiefly be

-               // divided into named and numeric attributes:

-               //

-               // Named attributes are assigned on a key/value basis, while numeric

-               // attributes are treated as an array.

-               //

-               // Named attributes can be formatted as either `name="value"`,

-               // `name='value'`, or `name=value`. Numeric attributes can be formatted

-               // as `"value"` or just `value`.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /*

+                * ### Parse shortcode attributes.

+                *

+                * Shortcodes accept many types of attributes. These can chiefly be

+                * divided into named and numeric attributes:

+                *

+                * Named attributes are assigned on a key/value basis, while numeric

+                * attributes are treated as an array.

+                *

+                * Named attributes can be formatted as either `name="value"`,

+                * `name='value'`, or `name=value`. Numeric attributes can be formatted

+                * as `"value"` or just `value`.

+                */

</ins><span class="cx" style="display: block; padding: 0 10px">                 attrs: _.memoize( function( text ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        var named   = {},

</span><span class="cx" style="display: block; padding: 0 10px">                                numeric = [],

</span><span class="cx" style="display: block; padding: 0 10px">                                pattern, match;

</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 regular expression is reused from `shortcode_parse_atts()`

-                       // in `wp-includes/shortcodes.php`.

-                       //

-                       // Capture groups:

-                       //

-                       // 1. An attribute name, that corresponds to...

-                       // 2. a value in double quotes.

-                       // 3. An attribute name, that corresponds to...

-                       // 4. a value in single quotes.

-                       // 5. An attribute name, that corresponds to...

-                       // 6. an unquoted value.

-                       // 7. A numeric attribute in double quotes.

-                       // 8. A numeric attribute in single quotes.

-                       // 9. An unquoted numeric attribute.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 /*

+                        * This regular expression is reused from `shortcode_parse_atts()`

+                        * in `wp-includes/shortcodes.php`.

+                        *

+                        * Capture groups:

+                        *

+                        * 1. An attribute name, that corresponds to...

+                        * 2. a value in double quotes.

+                        * 3. An attribute name, that corresponds to...

+                        * 4. a value in single quotes.

+                        * 5. An attribute name, that corresponds to...

+                        * 6. an unquoted value.

+                        * 7. A numeric attribute in double quotes.

+                        * 8. A numeric attribute in single quotes.

+                        * 9. An unquoted numeric attribute.

+                        */

</ins><span class="cx" style="display: block; padding: 0 10px">                         pattern = /([\w-]+)\s*=\s*"([^"]*)"(?:\s|$)|([\w-]+)\s*=\s*'([^']*)'(?:\s|$)|([\w-]+)\s*=\s*([^\s'"]+)(?:\s|$)|"([^"]*)"(?:\s|$)|'([^']*)'(?:\s|$)|(\S+)(?:\s|$)/g;

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                        // Map zero-width spaces to actual spaces.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -172,10 +184,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        };

</span><span class="cx" style="display: block; padding: 0 10px">                }),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // ### Generate a Shortcode Object from a RegExp match

-               // Accepts a `match` object from calling `regexp.exec()` on a `RegExp`

-               // generated by `wp.shortcode.regexp()`. `match` can also be set to the

-               // `arguments` from a callback passed to `regexp.replace()`.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /*

+                * ### Generate a Shortcode Object from a RegExp match.

+                *

+                * Accepts a `match` object from calling `regexp.exec()` on a `RegExp`

+                * generated by `wp.shortcode.regexp()`. `match` can also be set

+                * to the `arguments` from a callback passed to `regexp.replace()`.

+                */

</ins><span class="cx" style="display: block; padding: 0 10px">                 fromMatch: function( match ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        var type;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -197,16 +212,18 @@

</span><span class="cx" style="display: 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">-        // Shortcode Objects

-       // -----------------

-       //

-       // Shortcode objects are generated automatically when using the main

-       // `wp.shortcode` methods: `next()`, `replace()`, and `string()`.

-       //

-       // To access a raw representation of a shortcode, pass an `options` object,

-       // containing a `tag` string, a string or object of `attrs`, a string

-       // indicating the `type` of the shortcode ('single', 'self-closing', or

-       // 'closed'), and a `content` string.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*

+        * Shortcode Objects

+        * -----------------

+        *

+        * Shortcode objects are generated automatically when using the main

+        * `wp.shortcode` methods: `next()`, `replace()`, and `string()`.

+        *

+        * To access a raw representation of a shortcode, pass an `options` object,

+        * containing a `tag` string, a string or object of `attrs`, a string

+        * indicating the `type` of the shortcode ('single', 'self-closing',

+        * or 'closed'), and a `content` string.

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         wp.shortcode = _.extend( function( options ) {

</span><span class="cx" style="display: block; padding: 0 10px">                _.extend( this, _.pick( options || {}, 'tag', 'attrs', 'type', 'content' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -239,24 +256,28 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }, wp.shortcode );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        _.extend( wp.shortcode.prototype, {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // ### Get a shortcode attribute

-               //

-               // Automatically detects whether `attr` is named or numeric and routes

-               // it accordingly.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /*

+                * ### Get a shortcode attribute.

+                *

+                * Automatically detects whether `attr` is named or numeric and routes

+                * it accordingly.

+                */

</ins><span class="cx" style="display: block; padding: 0 10px">                 get: function( attr ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return this.attrs[ _.isNumber( attr ) ? 'numeric' : 'named' ][ attr ];

</span><span class="cx" style="display: block; padding: 0 10px">                },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // ### Set a shortcode attribute

-               //

-               // Automatically detects whether `attr` is named or numeric and routes

-               // it accordingly.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /*

+                * ### Set a shortcode attribute.

+                *

+                * Automatically detects whether `attr` is named or numeric and routes

+                * it accordingly.

+                */

</ins><span class="cx" style="display: block; padding: 0 10px">                 set: function( attr, value ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        this.attrs[ _.isNumber( attr ) ? 'numeric' : 'named' ][ attr ] = value;

</span><span class="cx" style="display: block; padding: 0 10px">                        return this;

</span><span class="cx" style="display: block; padding: 0 10px">                },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // ### Transform the shortcode match into a string

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // ### Transform the shortcode match into a string.

</ins><span class="cx" style="display: block; padding: 0 10px">                 string: function() {

</span><span class="cx" style="display: block; padding: 0 10px">                        var text    = '[' + this.tag;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -293,20 +314,24 @@

</span><span class="cx" style="display: 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">-// HTML utility functions

-// ----------------------

-//

-// Experimental. These functions may change or be removed in the future.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/*

+ * HTML utility functions

+ * ----------------------

+ *

+ * Experimental. These functions may change or be removed in the future.

+ */

</ins><span class="cx" style="display: block; padding: 0 10px"> (function(){

</span><span class="cx" style="display: block; padding: 0 10px">        wp.html = _.extend( wp.html || {}, {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // ### Parse HTML attributes.

-               //

-               // Converts `content` to a set of parsed HTML attributes.

-               // Utilizes `wp.shortcode.attrs( content )`, which is a valid superset of

-               // the HTML attribute specification. Reformats the attributes into an

-               // object that contains the `attrs` with `key:value` mapping, and a record

-               // of the attributes that were entered using `empty` attribute syntax (i.e.

-               // with no value).

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /*

+                * ### Parse HTML attributes.

+                *

+                * Converts `content` to a set of parsed HTML attributes.

+                * Utilizes `wp.shortcode.attrs( content )`, which is a valid superset of

+                * the HTML attribute specification. Reformats the attributes into an

+                * object that contains the `attrs` with `key:value` mapping, and a record

+                * of the attributes that were entered using `empty` attribute syntax (i.e.

+                * with no value).

+                */

</ins><span class="cx" style="display: block; padding: 0 10px">                 attrs: function( content ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        var result, attrs;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunksrcjs_enqueueswpsvgpainterjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/wp/svg-painter.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/wp/svg-painter.js  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/wp/svg-painter.js    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,7 +13,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                elements = [];

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $(document).ready( function() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // detection for browser SVG capability

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Detection for browser SVG capability.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( document.implementation.hasFeature( 'http://www.w3.org/TR/SVG11/feature#Image', '1.1' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $( document.body ).removeClass( 'no-svg' ).addClass( 'svg' );

</span><span class="cx" style="display: block; padding: 0 10px">                        wp.svgPainter.init();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -148,24 +148,24 @@

</span><span class="cx" style="display: block; padding: 0 10px">                },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                paint: function() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // loop through all elements

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Loop through all elements.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $.each( elements, function( index, $element ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                var $menuitem = $element.parent().parent();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( $menuitem.hasClass( 'current' ) || $menuitem.hasClass( 'wp-has-current-submenu' ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // paint icon in 'current' color

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Paint icon in 'current' color.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         painter.paintElement( $element, 'current' );

</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">-                                        // paint icon in base color

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Paint icon in base color.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         painter.paintElement( $element, 'base' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // set hover callbacks

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Set hover callbacks.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         $menuitem.hover(

</span><span class="cx" style="display: block; padding: 0 10px">                                                function() {

</span><span class="cx" style="display: block; padding: 0 10px">                                                        painter.paintElement( $element, 'focus' );

</span><span class="cx" style="display: block; padding: 0 10px">                                                },

</span><span class="cx" style="display: block; padding: 0 10px">                                                function() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                        // Match the delay from hoverIntent

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 // Match the delay from hoverIntent.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                         window.setTimeout( function() {

</span><span class="cx" style="display: block; padding: 0 10px">                                                                painter.paintElement( $element, 'base' );

</span><span class="cx" style="display: block; padding: 0 10px">                                                        }, 100 );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -184,7 +184,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        color = colorscheme[ colorType ];

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // only accept hex colors: #101 or #101010

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Only accept hex colors: #101 or #101010.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( ! color.match( /^(#[0-9a-f]{3}|#[0-9a-f]{6})$/i ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                return;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -212,13 +212,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                } catch ( error ) {}

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( xml ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // replace `fill` attributes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Replace `fill` attributes.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         xml = xml.replace( /fill="(.+?)"/g, 'fill="' + color + '"');

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // replace `style` attributes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Replace `style` attributes.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         xml = xml.replace( /style="(.+?)"/g, 'style="fill:' + color + '"');

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // replace `fill` properties in `<style>` tags

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Replace `fill` properties in `<style>` tags.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         xml = xml.replace( /fill:.*?;/g, 'fill: ' + color + ';');

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                        if ( 'btoa' in window ) {

</span></span></pre></div>

<a id="trunksrcjs_enqueueswpthemeplugineditorjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/wp/theme-plugin-editor.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/wp/theme-plugin-editor.js  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/wp/theme-plugin-editor.js    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -491,7 +491,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                var TreeitemLink = function (node, treeObj, group) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Check whether node is a DOM element

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Check whether node is a DOM element.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if (typeof node !== 'object') {

</span><span class="cx" style="display: block; padding: 0 10px">                                return;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -696,7 +696,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                TreeitemLink.prototype.handleClick = function (event) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // only process click events that directly happened on this treeitem

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Only process click events that directly happened on this treeitem.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if (event.target !== this.domNode && event.target !== this.domNode.firstElementChild) {

</span><span class="cx" style="display: block; padding: 0 10px">                                return;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -773,7 +773,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">                var TreeLinks = function (node) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Check whether node is a DOM element

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Check whether node is a DOM element.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if (typeof node !== 'object') {

</span><span class="cx" style="display: block; padding: 0 10px">                                return;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -812,7 +812,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">-                        // initialize pop up menus

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Initialize pop up menus.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if (!this.domNode.getAttribute('role')) {

</span><span class="cx" style="display: block; padding: 0 10px">                                this.domNode.setAttribute('role', 'tree');

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -964,16 +964,16 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        var start, index;

</span><span class="cx" style="display: block; padding: 0 10px">                        _char = _char.toLowerCase();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Get start index for search based on position of currentItem

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Get start index for search based on position of currentItem.

</ins><span class="cx" style="display: block; padding: 0 10px">                         start = this.treeitems.indexOf(currentItem) + 1;

</span><span class="cx" style="display: block; padding: 0 10px">                        if (start === this.treeitems.length) {

</span><span class="cx" style="display: block; padding: 0 10px">                                start = 0;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Check remaining slots in the menu

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Check remaining slots in the menu.

</ins><span class="cx" style="display: block; padding: 0 10px">                         index = this.getIndexFirstChars(start, _char);

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // If not found in remaining slots, check from beginning

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // If not found in remaining slots, check from beginning.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if (index === -1) {

</span><span class="cx" style="display: block; padding: 0 10px">                                index = this.getIndexFirstChars(0, _char);

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span></span></pre></div>

<a id="trunksrcjs_enqueueswpthemejs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/wp/theme.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/wp/theme.js        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/wp/theme.js  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,20 +11,20 @@

</span><span class="cx" style="display: block; padding: 0 10px"> var themes, l10n;

</span><span class="cx" style="display: block; padding: 0 10px"> themes = wp.themes = wp.themes || {};

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Store the theme data and settings for organized and quick access

-// themes.data.settings, themes.data.themes, themes.data.l10n

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Store the theme data and settings for organized and quick access.

+// themes.data.settings, themes.data.themes, themes.data.l10n.

</ins><span class="cx" style="display: block; padding: 0 10px"> themes.data = _wpThemeSettings;

</span><span class="cx" style="display: block; padding: 0 10px"> l10n = themes.data.l10n;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Shortcut for isInstall check

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Shortcut for isInstall check.

</ins><span class="cx" style="display: block; padding: 0 10px"> themes.isInstall = !! themes.data.settings.isInstall;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Setup app structure

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Setup app structure.

</ins><span class="cx" style="display: block; padding: 0 10px"> _.extend( themes, { model: {}, view: {}, routes: {}, router: {}, template: wp.template });

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> themes.Model = Backbone.Model.extend({

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Adds attributes to the default data coming through the .org themes api

-       // Map `id` to `slug` for shared code

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Adds attributes to the default data coming through the .org themes api.

+       // Map `id` to `slug` for shared code.

</ins><span class="cx" style="display: block; padding: 0 10px">         initialize: function() {

</span><span class="cx" style="display: block; padding: 0 10px">                var description;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,14 +33,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        this.set({ installed: 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">-                // Set the attributes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set the attributes.

</ins><span class="cx" style="display: block; padding: 0 10px">                 this.set({

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // slug is for installation, id is for existing.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // `slug` is for installation, `id` is for existing.

</ins><span class="cx" style="display: block; padding: 0 10px">                         id: this.get( 'slug' ) || this.get( 'id' )

</span><span class="cx" style="display: block; padding: 0 10px">                });

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                // Map `section.description` to `description`

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // as the API sometimes returns it differently

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // as the API sometimes returns it differently.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( this.has( 'sections' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        description = this.get( 'sections' ).description;

</span><span class="cx" style="display: block; padding: 0 10px">                        this.set({ description: description });

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,31 +48,31 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> });

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Main view controller for themes.php

-// Unifies and renders all available views

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Main view controller for themes.php.

+// Unifies and renders all available views.

</ins><span class="cx" style="display: block; padding: 0 10px"> themes.view.Appearance = wp.Backbone.View.extend({

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        el: '#wpbody-content .wrap .theme-browser',

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        window: $( window ),

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Pagination instance

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Pagination instance.

</ins><span class="cx" style="display: block; padding: 0 10px">         page: 0,

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Sets up a throttler for binding to 'scroll'

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Sets up a throttler for binding to 'scroll'.

</ins><span class="cx" style="display: block; padding: 0 10px">         initialize: function( options ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Scroller checks how far the scroll position is

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Scroller checks how far the scroll position is.

</ins><span class="cx" style="display: block; padding: 0 10px">                 _.bindAll( this, 'scroller' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                this.SearchView = options.SearchView ? options.SearchView : themes.view.Search;

</span><span class="cx" style="display: block; padding: 0 10px">                // Bind to the scroll event and throttle

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // the results from this.scroller

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // the results from this.scroller.

</ins><span class="cx" style="display: block; padding: 0 10px">                 this.window.bind( 'scroll', _.throttle( this.scroller, 300 ) );

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Main render control

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Main render control.

</ins><span class="cx" style="display: block; padding: 0 10px">         render: function() {

</span><span class="cx" style="display: block; padding: 0 10px">                // Setup the main theme view

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // with the current theme collection

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // with the current theme collection.

</ins><span class="cx" style="display: block; padding: 0 10px">                 this.view = new themes.view.Themes({

</span><span class="cx" style="display: block; padding: 0 10px">                        collection: this.collection,

</span><span class="cx" style="display: block; padding: 0 10px">                        parent: this

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,21 +83,21 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                this.$el.removeClass( 'search-loading' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Render and append

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Render and append.

</ins><span class="cx" style="display: block; padding: 0 10px">                 this.view.render();

</span><span class="cx" style="display: block; padding: 0 10px">                this.$el.empty().append( this.view.el ).addClass( 'rendered' );

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Defines search element container

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Defines search element container.

</ins><span class="cx" style="display: block; padding: 0 10px">         searchContainer: $( '.search-form' ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        // Search input and view

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // for current theme collection

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // for current theme collection.

</ins><span class="cx" style="display: block; padding: 0 10px">         search: function() {

</span><span class="cx" style="display: block; padding: 0 10px">                var view,

</span><span class="cx" style="display: block; padding: 0 10px">                        self = this;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Don't render the search if there is only one theme

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Don't render the search if there is only one theme.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( themes.data.themes.length === 1 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -108,7 +108,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                });

</span><span class="cx" style="display: block; padding: 0 10px">                self.SearchView = view;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Render and append after screen title

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Render and append after screen title.

</ins><span class="cx" style="display: block; padding: 0 10px">                 view.render();

</span><span class="cx" style="display: block; padding: 0 10px">                this.searchContainer

</span><span class="cx" style="display: block; padding: 0 10px">                        .append( $.parseHTML( '<label class="screen-reader-text" for="wp-filter-search-input">' + l10n.search + '</label>' ) )

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -119,7 +119,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        // Checks when the user gets close to the bottom

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // of the mage and triggers a theme:scroll event

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // of the mage and triggers a theme:scroll event.

</ins><span class="cx" style="display: block; padding: 0 10px">         scroller: function() {

</span><span class="cx" style="display: block; padding: 0 10px">                var self = this,

</span><span class="cx" style="display: block; padding: 0 10px">                        bottom, threshold;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -134,26 +134,26 @@

</span><span class="cx" style="display: 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">-// Set up the Collection for our theme data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Set up the Collection for our theme data.

</ins><span class="cx" style="display: block; padding: 0 10px"> // @has 'id' 'name' 'screenshot' 'author' 'authorURI' 'version' 'active' ...

</span><span class="cx" style="display: block; padding: 0 10px"> themes.Collection = Backbone.Collection.extend({

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        model: themes.Model,

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Search terms

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Search terms.

</ins><span class="cx" style="display: block; padding: 0 10px">         terms: '',

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        // Controls searching on the current theme collection

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // and triggers an update event

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // and triggers an update event.

</ins><span class="cx" style="display: block; padding: 0 10px">         doSearch: function( value ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Don't do anything if we've already done this search

-               // Useful because the Search handler fires multiple times per keystroke

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Don't do anything if we've already done this search.

+               // Useful because the Search handler fires multiple times per keystroke.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( this.terms === value ) {

</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">-                // Updates terms with the value passed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Updates terms with the value passed.

</ins><span class="cx" style="display: block; padding: 0 10px">                 this.terms = value;

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // If we have terms, run a search...

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -161,38 +161,41 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        this.search( this.terms );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If search is blank, show all themes

-               // Useful for resetting the views when you clean the input

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If search is blank, show all themes.

+               // Useful for resetting the views when you clean the input.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( this.terms === '' ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        this.reset( themes.data.themes );

</span><span class="cx" style="display: block; padding: 0 10px">                        $( 'body' ).removeClass( 'no-results' );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Trigger a 'themes:update' event

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Trigger a 'themes:update' event.

</ins><span class="cx" style="display: block; padding: 0 10px">                 this.trigger( 'themes:update' );

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Performs a search within the collection

-       // @uses RegExp

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**

+        * Performs a search within the collection.

+        *

+        * @uses RegExp

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         search: function( term ) {

</span><span class="cx" style="display: block; padding: 0 10px">                var match, results, haystack, name, description, author;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Start with a full collection

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Start with a full collection.

</ins><span class="cx" style="display: block; padding: 0 10px">                 this.reset( themes.data.themes, { silent: 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">-                // Trim the term

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Trim the term.

</ins><span class="cx" style="display: block; padding: 0 10px">                 term = term.trim();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Escape the term string for RegExp meta characters

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Escape the term string for RegExp meta characters.

</ins><span class="cx" style="display: block; padding: 0 10px">                 term = term.replace( /[-\/\\^$*+?.()|[\]{}]/g, '\\$&' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                // Consider spaces as word delimiters and match the whole string

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // so matching terms can be combined

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // so matching terms can be combined.

</ins><span class="cx" style="display: block; padding: 0 10px">                 term = term.replace( / /g, ')(?=.*' );

</span><span class="cx" style="display: block; padding: 0 10px">                match = new RegExp( '^(?=.*' + term + ').+', 'i' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Find results

-               // _.filter and .test

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Find results.

+               // _.filter() and .test().

</ins><span class="cx" style="display: block; padding: 0 10px">                 results = this.filter( function( data ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        name        = data.get( 'name' ).replace( /(<([^>]+)>)/ig, '' );

</span><span class="cx" style="display: block; padding: 0 10px">                        description = data.get( 'description' ).replace( /(<([^>]+)>)/ig, '' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -217,12 +220,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        // Paginates the collection with a helper method

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // that slices the collection

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // that slices the collection.

</ins><span class="cx" style="display: block; padding: 0 10px">         paginate: function( instance ) {

</span><span class="cx" style="display: block; padding: 0 10px">                var collection = this;

</span><span class="cx" style="display: block; padding: 0 10px">                instance = instance || 0;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Themes per instance are set at 20

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Themes per instance are set at 20.

</ins><span class="cx" style="display: block; padding: 0 10px">                 collection = _( collection.rest( 20 * instance ) );

</span><span class="cx" style="display: block; padding: 0 10px">                collection = _( collection.first( 20 ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -231,11 +234,13 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        count: 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">-        // Handles requests for more themes

-       // and caches results

-       //

-       // When we are missing a cache object we fire an apiCall()

-       // which triggers events of `query:success` or `query:fail`

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*

+        * Handles requests for more themes and caches results.

+        *

+        *

+        * When we are missing a cache object we fire an apiCall()

+        * which triggers events of `query:success` or `query:fail`.

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         query: function( request ) {

</span><span class="cx" style="display: block; padding: 0 10px">                /**

</span><span class="cx" style="display: block; padding: 0 10px">                 * @static

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -246,7 +251,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        query, isPaginated, count;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                // Store current query request args

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // for later use with the event `theme:end`

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // for later use with the event `theme:end`.

</ins><span class="cx" style="display: block; padding: 0 10px">                 this.currentQuery.request = request;

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Search the query cache for matches.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -271,7 +276,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( data.themes ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        self.reset( data.themes );

</span><span class="cx" style="display: block; padding: 0 10px">                                        count = data.info.results;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Store the results and the query request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Store the results and the query request.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         queries.push( { themes: data.themes, request: request, total: count } );

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -291,8 +296,8 @@

<span class="cx" style="display: block; padding: 0 10px">                        // If it's a paginated request we need to fetch more themes...

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( isPaginated ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                return this.apiCall( request, isPaginated ).done( function( data ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Add the new themes to the current collection

-                                       // @todo update counter

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Add the new themes to the current collection.

+                                       // @todo Update counter.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         self.add( data.themes );

</span><span class="cx" style="display: block; padding: 0 10px">                                        self.trigger( 'query:success' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -311,7 +316,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        // Only trigger an update event since we already have the themes

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // on our cached object

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // on our cached object.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( _.isNumber( query.total ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                this.count = query.total;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -326,20 +331,20 @@

</span><span class="cx" style="display: 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">-        // Local cache array for API queries

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Local cache array for API queries.

</ins><span class="cx" style="display: block; padding: 0 10px">         queries: [],

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Keep track of current query so we can handle pagination

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Keep track of current query so we can handle pagination.

</ins><span class="cx" style="display: block; padding: 0 10px">         currentQuery: {

</span><span class="cx" style="display: block; padding: 0 10px">                page: 1,

</span><span class="cx" style="display: block; padding: 0 10px">                request: {}

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Send request to api.wordpress.org/themes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Send request to api.wordpress.org/themes.

</ins><span class="cx" style="display: block; padding: 0 10px">         apiCall: function( request, paginated ) {

</span><span class="cx" style="display: block; padding: 0 10px">                return wp.ajax.send( 'query-themes', {

</span><span class="cx" style="display: block; padding: 0 10px">                        data: {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Request data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Request data.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 request: _.extend({

</span><span class="cx" style="display: block; padding: 0 10px">                                        per_page: 100

</span><span class="cx" style="display: block; padding: 0 10px">                                }, request)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -347,7 +352,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        beforeSend: function() {

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( ! paginated ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Spin it

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Spin it.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         $( 'body' ).addClass( 'loading-content' ).removeClass( 'no-results' );

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -359,17 +364,17 @@

</span><span class="cx" style="display: block; padding: 0 10px"> });

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> // This is the view that controls each theme item

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// that will be displayed on the screen

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// that will be displayed on the screen.

</ins><span class="cx" style="display: block; padding: 0 10px"> themes.view.Theme = wp.Backbone.View.extend({

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Wrap theme data on a div.theme element

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Wrap theme data on a div.theme element.

</ins><span class="cx" style="display: block; padding: 0 10px">         className: 'theme',

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Reflects which theme view we have

-       // 'grid' (default) or 'detail'

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Reflects which theme view we have.

+       // 'grid' (default) or 'detail'.

</ins><span class="cx" style="display: block; padding: 0 10px">         state: 'grid',

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // The HTML template for each element to be rendered

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // The HTML template for each element to be rendered.

</ins><span class="cx" style="display: block; padding: 0 10px">         html: themes.template( 'theme' ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        events: {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -391,7 +396,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        render: function() {

</span><span class="cx" style="display: block; padding: 0 10px">                var data = this.model.toJSON();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Render themes using the html template

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Render themes using the html template.

</ins><span class="cx" style="display: block; padding: 0 10px">                 this.$el.html( this.html( data ) ).attr({

</span><span class="cx" style="display: block; padding: 0 10px">                        tabindex: 0,

</span><span class="cx" style="display: block; padding: 0 10px">                        'aria-describedby' : data.id + '-action ' + data.id + '-name',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -398,7 +403,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'data-slug': data.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">-                // Renders active theme styles

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Renders active theme styles.

</ins><span class="cx" style="display: block; padding: 0 10px">                 this.activeTheme();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( this.model.get( 'displayAuthor' ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -407,7 +412,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">        // Adds a class to the currently active theme

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // and to the overlay in detailed view mode

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // and to the overlay in detailed view mode.

</ins><span class="cx" style="display: block; padding: 0 10px">         activeTheme: function() {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( this.model.get( 'active' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        this.$el.addClass( 'active' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -422,25 +427,25 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $themeToFocus.addClass('focus');

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Single theme overlay screen

-       // It's shown when clicking a theme

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Single theme overlay screen.

+       // It's shown when clicking a theme.

</ins><span class="cx" style="display: block; padding: 0 10px">         expand: function( event ) {

</span><span class="cx" style="display: block; padding: 0 10px">                var self = this;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                event = event || window.event;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // 'enter' and 'space' keys expand the details view when a theme is :focused

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // 'Enter' and 'Space' keys expand the details view when a theme is :focused.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( event.type === 'keydown' && ( event.which !== 13 && event.which !== 32 ) ) {

</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">-                // Bail if the user scrolled on a touch device

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Bail if the user scrolled on a touch device.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( this.touchDrag === true ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return this.touchDrag = false;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                // Prevent the modal from showing when the user clicks

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // one of the direct action buttons

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // one of the direct action buttons.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $( event.target ).is( '.theme-actions a' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -450,7 +455,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">-                // Set focused theme to current element

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set focused theme to current element.

</ins><span class="cx" style="display: block; padding: 0 10px">                 themes.focusedTheme = this.$el;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                this.trigger( 'theme:expand', self.model.cid );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -466,7 +471,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                event = event || window.event;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Bail if the user scrolled on a touch device

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Bail if the user scrolled on a touch device.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( this.touchDrag === true ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return this.touchDrag = false;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -476,12 +481,12 @@

</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">-                // 'enter' and 'space' keys expand the details view when a theme is :focused

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // 'Enter' and 'Space' keys expand the details view when a theme is :focused.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( event.type === 'keydown' && ( event.which !== 13 && event.which !== 32 ) ) {

</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">-                // pressing enter while focused on the buttons shouldn't open the preview

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Pressing Enter while focused on the buttons shouldn't open the preview.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( event.type === 'keydown' && event.which !== 13 && $( ':focus' ).hasClass( 'button' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -502,7 +507,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                preview.render();

</span><span class="cx" style="display: block; padding: 0 10px">                this.setNavButtonsState();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Hide previous/next navigation if there is only one theme

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Hide previous/next navigation if there is only one theme.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( this.model.collection.length === 1 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        preview.$el.addClass( 'no-navigation' );

</span><span class="cx" style="display: block; padding: 0 10px">                } else {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -509,7 +514,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        preview.$el.removeClass( 'no-navigation' );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Append preview

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Append preview.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $( 'div.wrap' ).append( preview.el );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                // Listen to our preview object

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -545,7 +550,7 @@

<span class="cx" style="display: block; padding: 0 10px">                        // Keep track of current theme model.

</span><span class="cx" style="display: block; padding: 0 10px">                        current = self.model;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Bail early if we are at the beginning of the collection

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Bail early if we are at the beginning of the collection.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( self.model.collection.indexOf( self.current ) === 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="lines" style="display: block; padding: 0 10px; color: #888">@@ -577,7 +582,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">-        // Handles .disabled classes for previous/next buttons in theme installer preview

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Handles .disabled classes for previous/next buttons in theme installer preview.

</ins><span class="cx" style="display: block; padding: 0 10px">         setNavButtonsState: function() {

</span><span class="cx" style="display: block; padding: 0 10px">                var $themeInstaller = $( '.theme-install-overlay' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        current = _.isUndefined( this.current ) ? this.model : this.current,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -584,7 +589,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        previousThemeButton = $themeInstaller.find( '.previous-theme' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        nextThemeButton = $themeInstaller.find( '.next-theme' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Disable previous at the zero position

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Disable previous at the zero position.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( 0 === this.model.collection.indexOf( current ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        previousThemeButton

</span><span class="cx" style="display: block; padding: 0 10px">                                .addClass( 'disabled' )

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -593,7 +598,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        nextThemeButton.focus();

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Disable next if the next model is undefined

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Disable next if the next model is undefined.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( _.isUndefined( this.model.collection.at( this.model.collection.indexOf( current ) + 1 ) ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        nextThemeButton

</span><span class="cx" style="display: block; padding: 0 10px">                                .addClass( 'disabled' )

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -649,11 +654,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> });

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Theme Details view

-// Set ups a modal overlay with the expanded theme data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Theme Details view.

+// Sets up a modal overlay with the expanded theme data.

</ins><span class="cx" style="display: block; padding: 0 10px"> themes.view.Details = wp.Backbone.View.extend({

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Wrap theme data on a div.theme element

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Wrap theme data on a div.theme element.

</ins><span class="cx" style="display: block; padding: 0 10px">         className: 'theme-overlay',

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        events: {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -664,26 +669,26 @@

</span><span class="cx" style="display: block; padding: 0 10px">                'click #update-theme': 'updateTheme'

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // The HTML template for the theme overlay

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // The HTML template for the theme overlay.

</ins><span class="cx" style="display: block; padding: 0 10px">         html: themes.template( 'theme-single' ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        render: function() {

</span><span class="cx" style="display: block; padding: 0 10px">                var data = this.model.toJSON();

</span><span class="cx" style="display: block; padding: 0 10px">                this.$el.html( this.html( data ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Renders active theme styles

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Renders active theme styles.

</ins><span class="cx" style="display: block; padding: 0 10px">                 this.activeTheme();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set up navigation events

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set up navigation events.

</ins><span class="cx" style="display: block; padding: 0 10px">                 this.navigation();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Checks screenshot size

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Checks screenshot size.

</ins><span class="cx" style="display: block; padding: 0 10px">                 this.screenshotCheck( this.$el );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Contain "tabbing" inside the overlay

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Contain "tabbing" inside the overlay.

</ins><span class="cx" style="display: block; padding: 0 10px">                 this.containFocus( this.$el );

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        // Adds a class to the currently active theme

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // and to the overlay in detailed view mode

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // and to the overlay in detailed view mode.

</ins><span class="cx" style="display: block; padding: 0 10px">         activeTheme: function() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check the model has the active property

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check the model has the active property.

</ins><span class="cx" style="display: block; padding: 0 10px">                 this.$el.toggleClass( 'active', this.model.get( 'active' ) );

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -713,8 +718,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                });

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Single theme overlay screen

-       // It's shown when clicking a theme

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Single theme overlay screen.

+       // It's shown when clicking a theme.

</ins><span class="cx" style="display: block; padding: 0 10px">         collapse: function( event ) {

</span><span class="cx" style="display: block; padding: 0 10px">                var self = this,

</span><span class="cx" style="display: block; padding: 0 10px">                        scroll;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -721,36 +726,35 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                event = event || window.event;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Prevent collapsing detailed view when there is only one theme available

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Prevent collapsing detailed view when there is only one theme available.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( themes.data.themes.length === 1 ) {

</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">-                // Detect if the click is inside the overlay

-               // and don't close it unless the target was

-               // the div.back button

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Detect if the click is inside the overlay and don't close it

+               // unless the target was the div.back button.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $( event.target ).is( '.theme-backdrop' ) || $( event.target ).is( '.close' ) || event.keyCode === 27 ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Add a temporary closing class while overlay fades out

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Add a temporary closing class while overlay fades out.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $( 'body' ).addClass( 'closing-overlay' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // With a quick fade out animation

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // With a quick fade out animation.

</ins><span class="cx" style="display: block; padding: 0 10px">                         this.$el.fadeOut( 130, function() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Clicking outside the modal box closes the overlay

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Clicking outside the modal box closes the overlay.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $( 'body' ).removeClass( 'closing-overlay' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Handle event cleanup

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Handle event cleanup.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 self.closeOverlay();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Get scroll position to avoid jumping to the top

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Get scroll position to avoid jumping to the top.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 scroll = document.body.scrollTop;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Clean the url structure

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Clean the URL structure.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 themes.router.navigate( themes.router.baseUrl( '' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Restore scroll position

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Restore scroll position.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 document.body.scrollTop = scroll;

</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 focus to the theme div

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Return focus to the theme div.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( themes.focusedTheme ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        themes.focusedTheme.focus();

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -758,10 +762,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Handles .disabled classes for next/previous buttons

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Handles .disabled classes for next/previous buttons.

</ins><span class="cx" style="display: block; padding: 0 10px">         navigation: function() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Disable Left/Right when at the start or end of the collection

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Disable Left/Right when at the start or end of the collection.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( this.model.cid === this.model.collection.at(0).cid ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        this.$el.find( '.left' )

</span><span class="cx" style="display: block; padding: 0 10px">                                .addClass( 'disabled' )

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -775,7 +779,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">        // Performs the actions to effectively close

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // the theme details overlay

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // the theme details overlay.

</ins><span class="cx" style="display: block; padding: 0 10px">         closeOverlay: function() {

</span><span class="cx" style="display: block; padding: 0 10px">                $( 'body' ).removeClass( 'modal-open' );

</span><span class="cx" style="display: block; padding: 0 10px">                this.remove();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -848,7 +852,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">        // Checks if the theme screenshot is the old 300px width version

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // and adds a corresponding class if it's true

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // and adds a corresponding class if it's true.

</ins><span class="cx" style="display: block; padding: 0 10px">         screenshotCheck: function( el ) {

</span><span class="cx" style="display: block; padding: 0 10px">                var screenshot, image;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -856,7 +860,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                image = new Image();

</span><span class="cx" style="display: block; padding: 0 10px">                image.src = screenshot.attr( 'src' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Width check

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Width check.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( image.width && image.width <= 300 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        el.addClass( 'small-screenshot' );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -863,8 +867,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> });

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Theme Preview view

-// Set ups a modal overlay with the expanded theme data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Theme Preview view.

+// Sets up a modal overlay with the expanded theme data.

</ins><span class="cx" style="display: block; padding: 0 10px"> themes.view.Preview = themes.view.Details.extend({

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        className: 'wp-full-overlay expanded',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -880,7 +884,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                'click .theme-install': 'installTheme'

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // The HTML template for the theme preview

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // The HTML template for the theme preview.

</ins><span class="cx" style="display: block; padding: 0 10px">         html: themes.template( 'theme-preview' ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        render: function() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -918,7 +922,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                this.$el.fadeOut( 200, function() {

</span><span class="cx" style="display: block; padding: 0 10px">                        $( 'body' ).removeClass( 'theme-installer-active full-overlay-active' );

</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 focus to the theme div

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Return focus to the theme div.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( themes.focusedTheme ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                themes.focusedTheme.focus();

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -973,17 +977,17 @@

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        keyEvent: function( event ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // The escape key closes the preview

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // The escape key closes the preview.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( event.keyCode === 27 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        this.undelegateEvents();

</span><span class="cx" style="display: block; padding: 0 10px">                        this.close();

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // The right arrow key, next theme

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // The right arrow key, next theme.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( event.keyCode === 39 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        _.once( this.nextTheme() );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // The left arrow key, previous theme

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // The left arrow key, previous theme.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( event.keyCode === 37 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        this.previousTheme();

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1011,7 +1015,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"> // Controls the rendering of div.themes,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// a wrapper that will hold all the theme elements

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// a wrapper that will hold all the theme elements.

</ins><span class="cx" style="display: block; padding: 0 10px"> themes.view.Themes = wp.Backbone.View.extend({

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        className: 'themes wp-clearfix',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1018,25 +1022,25 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $overlay: $( 'div.theme-overlay' ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        // Number to keep track of scroll position

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // while in theme-overlay mode

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // while in theme-overlay mode.

</ins><span class="cx" style="display: block; padding: 0 10px">         index: 0,

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // The theme count element

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // The theme count element.

</ins><span class="cx" style="display: block; padding: 0 10px">         count: $( '.wrap .theme-count' ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // The live themes count

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // The live themes count.

</ins><span class="cx" style="display: block; padding: 0 10px">         liveThemeCount: 0,

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        initialize: function( options ) {

</span><span class="cx" style="display: block; padding: 0 10px">                var self = this;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set up parent

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set up parent.

</ins><span class="cx" style="display: block; padding: 0 10px">                 this.parent = options.parent;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set current view to [grid]

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set current view to [grid].

</ins><span class="cx" style="display: block; padding: 0 10px">                 this.setView( 'grid' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Move the active theme to the beginning of the collection

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Move the active theme to the beginning of the collection.

</ins><span class="cx" style="display: block; padding: 0 10px">                 self.currentTheme();

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // When the collection is updated by user input...

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1082,17 +1086,17 @@

</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">-                        // Pressing the right arrow key fires a theme:next event

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Pressing the right arrow key fires a theme:next event.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( event.keyCode === 39 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                self.overlay.nextTheme();

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Pressing the left arrow key fires a theme:previous event

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Pressing the left arrow key fires a theme:previous event.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( event.keyCode === 37 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                self.overlay.previousTheme();

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Pressing the escape key fires a theme:collapse event

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Pressing the escape key fires a theme:collapse event.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( event.keyCode === 27 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                self.overlay.collapse( event );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1100,35 +1104,33 @@

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        // Manages rendering of theme pages

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // and keeping theme count in sync

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // and keeping theme count in sync.

</ins><span class="cx" style="display: block; padding: 0 10px">         render: function() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Clear the DOM, please

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Clear the DOM, please.

</ins><span class="cx" style="display: block; padding: 0 10px">                 this.$el.empty();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If the user doesn't have switch capabilities

-               // or there is only one theme in the collection

-               // render the detailed view of the active theme

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If the user doesn't have switch capabilities or there is only one theme

+               // in the collection, render the detailed view of the active theme.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( themes.data.themes.length === 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">-                        // Constructs the view

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Constructs the view.

</ins><span class="cx" style="display: block; padding: 0 10px">                         this.singleTheme = new themes.view.Details({

</span><span class="cx" style="display: block; padding: 0 10px">                                model: this.collection.models[0]

</span><span class="cx" style="display: block; padding: 0 10px">                        });

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Render and apply a 'single-theme' class to our container

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Render and apply a 'single-theme' class to our container.

</ins><span class="cx" style="display: block; padding: 0 10px">                         this.singleTheme.render();

</span><span class="cx" style="display: block; padding: 0 10px">                        this.$el.addClass( 'single-theme' );

</span><span class="cx" style="display: block; padding: 0 10px">                        this.$el.append( this.singleTheme.el );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Generate the themes

-               // Using page instance

-               // While checking the collection has items

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Generate the themes using page instance

+               // while checking the collection has items.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( this.options.collection.size() > 0 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        this.renderThemes( this.parent.page );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Display a live theme count for the collection

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Display a live theme count for the collection.

</ins><span class="cx" style="display: block; padding: 0 10px">                 this.liveThemeCount = this.collection.count ? this.collection.count : this.collection.length;

</span><span class="cx" style="display: block; padding: 0 10px">                this.count.text( this.liveThemeCount );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1142,13 +1144,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">        // Iterates through each instance of the collection

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // and renders each theme module

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // and renders each theme module.

</ins><span class="cx" style="display: block; padding: 0 10px">         renderThemes: function( page ) {

</span><span class="cx" style="display: block; padding: 0 10px">                var self = this;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                self.instance = self.collection.paginate( page );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If we have no more themes bail

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If we have no more themes, bail.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( self.instance.size() === 0 ) {

<span class="cx" style="display: block; padding: 0 10px">                        // Fire a no-more-themes event.

</span><span class="cx" style="display: block; padding: 0 10px">                        this.parent.trigger( 'theme:end' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1155,12 +1157,12 @@

</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">-                // Make sure the add-new stays at the end

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure the add-new stays at the end.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! themes.isInstall && page >= 1 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $( '.add-new-theme' ).remove();

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Loop through the themes and setup each theme view

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Loop through the themes and setup each theme view.

</ins><span class="cx" style="display: block; padding: 0 10px">                 self.instance.each( function( theme ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        self.theme = new themes.view.Theme({

</span><span class="cx" style="display: block; padding: 0 10px">                                model: theme,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1169,15 +1171,15 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                        // Render the views...

</span><span class="cx" style="display: block; padding: 0 10px">                        self.theme.render();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // and append them to div.themes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // ...and append them to div.themes.

</ins><span class="cx" style="display: block; padding: 0 10px">                         self.$el.append( self.theme.el );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        // Binds to theme:expand to show the modal box

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // with the theme details

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // with the theme details.

</ins><span class="cx" style="display: block; padding: 0 10px">                         self.listenTo( self.theme, 'theme:expand', self.expand, self );

</span><span class="cx" style="display: block; padding: 0 10px">                });

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // 'Add new theme' element shown at the end of the grid

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // 'Add new theme' element shown at the end of the grid.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! themes.isInstall && themes.data.settings.canInstall ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        this.$el.append( '<div class="theme add-new-theme"><a href="' + themes.data.settings.installURI + '"><div class="theme-screenshot"><span></span></div><h2 class="theme-name">' + l10n.addNew + '</h2></a></div>' );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1185,7 +1187,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                this.parent.page++;

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Grabs current theme and puts it at the beginning of the collection

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Grabs current theme and puts it at the beginning of the collection.

</ins><span class="cx" style="display: block; padding: 0 10px">         currentTheme: function() {

</span><span class="cx" style="display: block; padding: 0 10px">                var self = this,

</span><span class="cx" style="display: block; padding: 0 10px">                        current;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1192,7 +1194,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                current = self.collection.findWhere({ active: 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">-                // Move the active theme to the beginning of the collection

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Move the active theme to the beginning of the collection.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( current ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        self.collection.remove( current );

</span><span class="cx" style="display: block; padding: 0 10px">                        self.collection.add( current, { at:0 } );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1199,27 +1201,27 @@

</span><span class="cx" style="display: 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">-        // Sets current view

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Sets current view.

</ins><span class="cx" style="display: block; padding: 0 10px">         setView: function( view ) {

</span><span class="cx" style="display: block; padding: 0 10px">                return view;

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Renders the overlay with the ThemeDetails view

-       // Uses the current model data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Renders the overlay with the ThemeDetails view.

+       // Uses the current model data.

</ins><span class="cx" style="display: block; padding: 0 10px">         expand: function( id ) {

</span><span class="cx" style="display: block; padding: 0 10px">                var self = this, $card, $modal;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set the current theme model

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set the current theme model.

</ins><span class="cx" style="display: block; padding: 0 10px">                 this.model = self.collection.get( 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">-                // Trigger a route update for the current model

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Trigger a route update for the current model.

</ins><span class="cx" style="display: block; padding: 0 10px">                 themes.router.navigate( themes.router.baseUrl( themes.router.themePath + this.model.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">-                // Sets this.view to 'detail'

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Sets this.view to 'detail'.

</ins><span class="cx" style="display: block; padding: 0 10px">                 this.setView( 'detail' );

</span><span class="cx" style="display: block; padding: 0 10px">                $( 'body' ).addClass( 'modal-open' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set up the theme details view

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set up the theme details view.

</ins><span class="cx" style="display: block; padding: 0 10px">                 this.overlay = new themes.view.Details({

</span><span class="cx" style="display: block; padding: 0 10px">                        model: self.model

</span><span class="cx" style="display: block; padding: 0 10px">                });

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1243,72 +1245,75 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                this.$overlay.html( this.overlay.el );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Bind to theme:next and theme:previous

-               // triggered by the arrow keys

-               //

-               // Keep track of the current model so we

-               // can infer an index position

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Bind to theme:next and theme:previous triggered by the arrow keys.

+               // Keep track of the current model so we can infer an index position.

</ins><span class="cx" style="display: block; padding: 0 10px">                 this.listenTo( this.overlay, 'theme:next', function() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Renders the next theme on the overlay

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Renders the next theme on the overlay.

</ins><span class="cx" style="display: block; padding: 0 10px">                         self.next( [ self.model.cid ] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                })

</span><span class="cx" style="display: block; padding: 0 10px">                .listenTo( this.overlay, 'theme:previous', function() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Renders the previous theme on the overlay

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Renders the previous theme on the overlay.

</ins><span class="cx" style="display: block; padding: 0 10px">                         self.previous( [ self.model.cid ] );

</span><span class="cx" style="display: 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 method renders the next theme on the overlay modal

-       // based on the current position in the collection

-       // @params [model cid]

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*

+        * This method renders the next theme on the overlay modal

+        * based on the current position in the collection.

+        *

+        * @params [model cid]

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         next: function( args ) {

</span><span class="cx" style="display: block; padding: 0 10px">                var self = this,

</span><span class="cx" style="display: block; padding: 0 10px">                        model, nextModel;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Get the current theme

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Get the current theme.

</ins><span class="cx" style="display: block; padding: 0 10px">                 model = self.collection.get( args[0] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Find the next model within the collection

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Find the next model within the collection.

</ins><span class="cx" style="display: block; padding: 0 10px">                 nextModel = self.collection.at( self.collection.indexOf( model ) + 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">-                // Sanity check which also serves as a boundary test

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Sanity check which also serves as a boundary test.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( nextModel !== undefined ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                        // We have a new theme...

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Close the overlay

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Close the overlay.

</ins><span class="cx" style="display: block; padding: 0 10px">                         this.overlay.closeOverlay();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Trigger a route update for the current model

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Trigger a route update for the current model.

</ins><span class="cx" style="display: block; padding: 0 10px">                         self.theme.trigger( 'theme:expand', nextModel.cid );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // This method renders the previous theme on the overlay modal

-       // based on the current position in the collection

-       // @params [model cid]

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*

+        * This method renders the previous theme on the overlay modal

+        * based on the current position in the collection.

+        *

+        * @params [model cid]

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         previous: function( args ) {

</span><span class="cx" style="display: block; padding: 0 10px">                var self = this,

</span><span class="cx" style="display: block; padding: 0 10px">                        model, previousModel;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Get the current theme

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Get the current theme.

</ins><span class="cx" style="display: block; padding: 0 10px">                 model = self.collection.get( args[0] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Find the previous model within the collection

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Find the previous model within the collection.

</ins><span class="cx" style="display: block; padding: 0 10px">                 previousModel = self.collection.at( self.collection.indexOf( model ) - 1 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( previousModel !== undefined ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                        // We have a new theme...

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Close the overlay

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Close the overlay.

</ins><span class="cx" style="display: block; padding: 0 10px">                         this.overlay.closeOverlay();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Trigger a route update for the current model

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Trigger a route update for the current model.

</ins><span class="cx" style="display: block; padding: 0 10px">                         self.theme.trigger( 'theme:expand', previousModel.cid );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Dispatch audible search results feedback message

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Dispatch audible search results feedback message.

</ins><span class="cx" style="display: block; padding: 0 10px">         announceSearchResults: function( count ) {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( 0 === count ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        wp.a11y.speak( l10n.noThemesFound );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1364,7 +1369,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                this.collection.doSearch( event.target.value.replace( /\+/g, ' ' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // if search is initiated and key is not return

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // if search is initiated and key is not return.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( this.searching && event.which !== 13 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        options.replace = true;

</span><span class="cx" style="display: block; padding: 0 10px">                } else {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1371,7 +1376,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        this.searching = 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">-                // Update the URL hash

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Update the URL hash.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( event.target.value ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        themes.router.navigate( themes.router.baseUrl( themes.router.searchPath + event.target.value ), options );

</span><span class="cx" style="display: block; padding: 0 10px">                } else {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1408,8 +1413,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Sets up the routes events for relevant url queries

-// Listens to [theme] and [search] params

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Sets up the routes events for relevant url queries.

+// Listens to [theme] and [search] params.

</ins><span class="cx" style="display: block; padding: 0 10px"> themes.Router = Backbone.Router.extend({

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        routes: {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1439,14 +1444,14 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> });

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Execute and setup the application

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Execute and setup the application.

</ins><span class="cx" style="display: block; padding: 0 10px"> themes.Run = {

</span><span class="cx" style="display: block; padding: 0 10px">        init: function() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Initializes the blog's theme library view

-               // Create a new collection with data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Initializes the blog's theme library view.

+               // Create a new collection with data.

</ins><span class="cx" style="display: block; padding: 0 10px">                 this.themes = new themes.Collection( themes.data.themes );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set up the view

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set up the view.

</ins><span class="cx" style="display: block; padding: 0 10px">                 this.view = new themes.view.Appearance({

</span><span class="cx" style="display: block; padding: 0 10px">                        collection: this.themes

</span><span class="cx" style="display: block; padding: 0 10px">                });

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1459,7 +1464,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        render: function() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Render results

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Render results.

</ins><span class="cx" style="display: block; padding: 0 10px">                 this.view.render();

</span><span class="cx" style="display: block; padding: 0 10px">                this.routes();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1476,10 +1481,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">        routes: function() {

</span><span class="cx" style="display: block; padding: 0 10px">                var self = this;

</span><span class="cx" style="display: block; padding: 0 10px">                // Bind to our global thx object

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // so that the object is available to sub-views

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // so that the object is available to sub-views.

</ins><span class="cx" style="display: block; padding: 0 10px">                 themes.router = new themes.Router();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Handles theme details route event

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Handles theme details route event.

</ins><span class="cx" style="display: block; padding: 0 10px">                 themes.router.on( 'route:theme', function( slug ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        self.view.view.expand( slug );

</span><span class="cx" style="display: block; padding: 0 10px">                });

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1489,7 +1494,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        self.view.trigger( 'theme:close' );

</span><span class="cx" style="display: block; padding: 0 10px">                });

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Handles search route event

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Handles search route event.

</ins><span class="cx" style="display: block; padding: 0 10px">                 themes.router.on( 'route:search', function() {

</span><span class="cx" style="display: block; padding: 0 10px">                        $( '.wp-filter-search' ).trigger( 'keyup' );

</span><span class="cx" style="display: block; padding: 0 10px">                });

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1502,7 +1507,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">-// Extend the main Search view

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Extend the main Search view.

</ins><span class="cx" style="display: block; padding: 0 10px"> themes.view.InstallerSearch =  themes.view.Search.extend({

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        events: {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1512,10 +1517,10 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        terms: '',

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Handles Ajax request for searching through themes in public repo

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Handles Ajax request for searching through themes in public repo.

</ins><span class="cx" style="display: block; padding: 0 10px">         search: function( event ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Tabbing or reverse tabbing into the search input shouldn't trigger a search

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Tabbing or reverse tabbing into the search input shouldn't trigger a search.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( event.type === 'keyup' && ( event.which === 9 || event.which === 16 ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1543,19 +1548,23 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                request.search = value;

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Intercept an [author] search.

-               //

-               // If input value starts with `author:` send a request

-               // for `author` instead of a regular `search`

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /*

+                * Intercept an [author] search.

+                *

+                * If input value starts with `author:` send a request

+                * for `author` instead of a regular `search`.

+                */

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( value.substring( 0, 7 ) === 'author:' ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        request.search = '';

</span><span class="cx" style="display: block; padding: 0 10px">                        request.author = value.slice( 7 );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Intercept a [tag] search.

-               //

-               // If input value starts with `tag:` send a request

-               // for `tag` instead of a regular `search`

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /*

+                * Intercept a [tag] search.

+                *

+                * If input value starts with `tag:` send a request

+                * for `tag` instead of a regular `search`.

+                */

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( value.substring( 0, 4 ) === 'tag:' ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        request.search = '';

</span><span class="cx" style="display: block; padding: 0 10px">                        request.tag = [ value.slice( 4 ) ];

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1569,10 +1578,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $( '.drawer-toggle' ).attr( 'aria-expanded', 'false' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                // Get the themes by sending Ajax POST request to api.wordpress.org/themes

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // or searching the local cache

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // or searching the local cache.

</ins><span class="cx" style="display: block; padding: 0 10px">                 this.collection.query( 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">-                // Set route

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set route.

</ins><span class="cx" style="display: block; padding: 0 10px">                 themes.router.navigate( themes.router.baseUrl( themes.router.searchPath + encodeURIComponent( value ) ), { replace: 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">@@ -1581,7 +1590,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        el: '#wpbody-content .wrap',

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Register events for sorting and filters in theme-navigation

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Register events for sorting and filters in theme-navigation.

</ins><span class="cx" style="display: block; padding: 0 10px">         events: {

</span><span class="cx" style="display: block; padding: 0 10px">                'click .filter-links li > a': 'onSort',

</span><span class="cx" style="display: block; padding: 0 10px">                'click .theme-filter': 'onFilter',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1594,7 +1603,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                'keyup #wporg-username-input': 'saveUsername'

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Initial render method

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Initial render method.

</ins><span class="cx" style="display: block; padding: 0 10px">         render: function() {

</span><span class="cx" style="display: block; padding: 0 10px">                var self = this;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1606,7 +1615,7 @@

<span class="cx" style="display: block; padding: 0 10px">                // Bump `collection.currentQuery.page` and request more themes if we hit the end of the page.

</span><span class="cx" style="display: block; padding: 0 10px">                this.listenTo( this, 'theme:end', function() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Make sure we are not already loading

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Make sure we are not already loading.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( self.collection.loadingThemes ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                return;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1639,29 +1648,29 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        this.view.remove();

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set ups the view and passes the section argument

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Sets up the view and passes the section argument.

</ins><span class="cx" style="display: block; padding: 0 10px">                 this.view = new themes.view.Themes({

</span><span class="cx" style="display: block; padding: 0 10px">                        collection: this.collection,

</span><span class="cx" style="display: block; padding: 0 10px">                        parent: this

</span><span class="cx" style="display: block; padding: 0 10px">                });

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Reset pagination every time the install view handler is run

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Reset pagination every time the install view handler is run.

</ins><span class="cx" style="display: block; padding: 0 10px">                 this.page = 0;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Render and append

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Render and append.

</ins><span class="cx" style="display: block; padding: 0 10px">                 this.$el.find( '.themes' ).remove();

</span><span class="cx" style="display: block; padding: 0 10px">                this.view.render();

</span><span class="cx" style="display: block; padding: 0 10px">                this.$el.find( '.theme-browser' ).append( this.view.el ).addClass( 'rendered' );

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Handles all the rendering of the public theme directory

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Handles all the rendering of the public theme directory.

</ins><span class="cx" style="display: block; padding: 0 10px">         browse: function( section ) {

</span><span class="cx" style="display: block; padding: 0 10px">                // Create a new collection with the proper theme data

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // for each section

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // for each section.

</ins><span class="cx" style="display: block; padding: 0 10px">                 this.collection.query( { browse: section } );

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Sorting navigation

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Sorting navigation.

</ins><span class="cx" style="display: block; padding: 0 10px">         onSort: function( event ) {

</span><span class="cx" style="display: block; padding: 0 10px">                var $el = $( event.target ),

</span><span class="cx" style="display: block; padding: 0 10px">                        sort = $el.data( 'sort' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1671,7 +1680,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $( 'body' ).removeClass( 'filters-applied show-filters' );

</span><span class="cx" style="display: block; padding: 0 10px">                $( '.drawer-toggle' ).attr( 'aria-expanded', '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">-                // Bail if this is already active

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Bail if this is already active.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $el.hasClass( this.activeClass ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1678,7 +1687,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                this.sort( sort );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Trigger a router.naviagte update

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Trigger a router.navigate update.

</ins><span class="cx" style="display: block; padding: 0 10px">                 themes.router.navigate( themes.router.baseUrl( themes.router.browsePath + sort ) );

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1705,13 +1714,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                this.browse( sort );

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Filters and Tags

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Filters and Tags.

</ins><span class="cx" style="display: block; padding: 0 10px">         onFilter: function( event ) {

</span><span class="cx" style="display: block; padding: 0 10px">                var request,

</span><span class="cx" style="display: block; padding: 0 10px">                        $el = $( event.target ),

</span><span class="cx" style="display: block; padding: 0 10px">                        filter = $el.data( 'filter' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Bail if this is already active

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Bail if this is already active.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $el.hasClass( this.activeClass ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1728,21 +1737,21 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                // Construct the filter request

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // using the default values

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // using the default values.

</ins><span class="cx" style="display: block; padding: 0 10px">                 filter = _.union( [ filter, this.filtersChecked() ] );

</span><span class="cx" style="display: block; padding: 0 10px">                request = { tag: [ filter ] };

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                // Get the themes by sending Ajax POST request to api.wordpress.org/themes

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // or searching the local cache

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // or searching the local cache.

</ins><span class="cx" style="display: block; padding: 0 10px">                 this.collection.query( request );

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Clicking on a checkbox to add another filter to the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Clicking on a checkbox to add another filter to the request.

</ins><span class="cx" style="display: block; padding: 0 10px">         addFilter: function() {

</span><span class="cx" style="display: block; padding: 0 10px">                this.filtersChecked();

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Applying filters triggers a tag request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Applying filters triggers a tag request.

</ins><span class="cx" style="display: block; padding: 0 10px">         applyFilters: function( event ) {

</span><span class="cx" style="display: block; padding: 0 10px">                var name,

</span><span class="cx" style="display: block; padding: 0 10px">                        tags = this.filtersChecked(),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1771,7 +1780,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">                // Get the themes by sending Ajax POST request to api.wordpress.org/themes

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // or searching the local cache

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // or searching the local cache.

</ins><span class="cx" style="display: block; padding: 0 10px">                 this.collection.query( request );

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1786,7 +1795,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        event.preventDefault();

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // save username on enter

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Save username on enter.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( event.type === 'keyup' && event.which !== 13 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1798,14 +1807,17 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        },

</span><span class="cx" style="display: block; padding: 0 10px">                        success: function () {

</span><span class="cx" style="display: block; padding: 0 10px">                                // Get the themes by sending Ajax POST request to api.wordpress.org/themes

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // or searching the local cache

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // or searching the local cache.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 that.collection.query( request );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                } );

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Get the checked filters

-       // @return {array} of tags or false

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**

+        * Get the checked filters.

+        *

+        * @return {array} of tags or false

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         filtersChecked: function() {

</span><span class="cx" style="display: block; padding: 0 10px">                var items = $( '.filter-group' ).find( ':checkbox' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        tags = [];

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1814,7 +1826,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        tags.push( $( item ).prop( '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">-                // When no filters are checked, restore initial state and return

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // When no filters are checked, restore initial state and return.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( tags.length === 0 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $( '.filter-drawer .apply-filters' ).find( 'span' ).text( '' );

</span><span class="cx" style="display: block; padding: 0 10px">                        $( '.filter-drawer .clear-filters' ).hide();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1830,7 +1842,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        activeClass: 'current',

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /*

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**

</ins><span class="cx" style="display: block; padding: 0 10px">          * When users press the "Upload Theme" button, show the upload form in place.

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        uploader: function() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1845,7 +1857,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">-        // Toggle the full filters navigation

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Toggle the full filters navigation.

</ins><span class="cx" style="display: block; padding: 0 10px">         moreFilters: function( event ) {

</span><span class="cx" style="display: block; padding: 0 10px">                var $body = $( 'body' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        $toggleButton = $( '.drawer-toggle' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1865,8 +1877,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $toggleButton.attr( 'aria-expanded', $body.hasClass( 'show-filters' ) );

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Clears all the checked filters

-       // @uses filtersChecked()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**

+        * Clears all the checked filters.

+        *

+        * @uses filtersChecked()

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         clearFilters: function( event ) {

</span><span class="cx" style="display: block; padding: 0 10px">                var items = $( '.filter-group' ).find( ':checkbox' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        self = this;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1919,14 +1934,14 @@

</span><span class="cx" style="display: block; padding: 0 10px"> themes.RunInstaller = {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        init: function() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set up the view

-               // Passes the default 'section' as an option

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set up the view.

+               // Passes the default 'section' as an option.

</ins><span class="cx" style="display: block; padding: 0 10px">                 this.view = new themes.view.Installer({

</span><span class="cx" style="display: block; padding: 0 10px">                        section: 'featured',

</span><span class="cx" style="display: block; padding: 0 10px">                        SearchView: themes.view.InstallerSearch

</span><span class="cx" style="display: block; padding: 0 10px">                });

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Render results

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Render results.

</ins><span class="cx" style="display: block; padding: 0 10px">                 this.render();

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Start debouncing user searches after Backbone.history.start().

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1935,7 +1950,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        render: function() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Render results

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Render results.

</ins><span class="cx" style="display: block; padding: 0 10px">                 this.view.render();

</span><span class="cx" style="display: block; padding: 0 10px">                this.routes();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1954,11 +1969,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        request = {};

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                // Bind to our global `wp.themes` object

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // so that the router is available to sub-views

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // so that the router is available to sub-views.

</ins><span class="cx" style="display: block; padding: 0 10px">                 themes.router = new themes.InstallerRouter();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Handles `theme` route event

-               // Queries the API for the passed theme slug

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Handles `theme` route event.

+               // Queries the API for the passed theme slug.

</ins><span class="cx" style="display: block; padding: 0 10px">                 themes.router.on( 'route:preview', function( slug ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                        // Remove existing handlers.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1986,9 +2001,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                });

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Handles sorting / browsing routes

-               // Also handles the root URL triggering a sort request

-               // for `featured`, the default view

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /*

+                * Handles sorting / browsing routes.

+                * Also handles the root URL triggering a sort request

+                * for `featured`, the default view.

+                */

</ins><span class="cx" style="display: block; padding: 0 10px">                 themes.router.on( 'route:sort', function( sort ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! sort ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                sort = 'featured';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2043,7 +2060,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> })( jQuery );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Align theme browser thickbox

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Align theme browser thickbox.

</ins><span class="cx" style="display: block; padding: 0 10px"> jQuery(document).ready( function($) {

</span><span class="cx" style="display: block; padding: 0 10px">        window.tb_position = function() {

</span><span class="cx" style="display: block; padding: 0 10px">                var tbWindow = $('#TB_window'),

</span></span></pre></div>

<a id="trunksrcjs_enqueueswputiljs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/wp/util.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/wp/util.js 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/wp/util.js   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,11 +41,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                };

</span><span class="cx" style="display: block; padding: 0 10px">        });

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // wp.ajax

-       // ------

-       //

-       // Tools for sending ajax requests with JSON responses and built in error handling.

-       // Mirrors and wraps jQuery's ajax APIs.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*

+        * wp.ajax

+        * ------

+        *

+        * Tools for sending ajax requests with JSON responses and built in error handling.

+        * Mirrors and wraps jQuery's ajax APIs.

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         wp.ajax = {

</span><span class="cx" style="display: block; padding: 0 10px">                settings: settings.ajax || {},

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -105,7 +107,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                delete options.success;

</span><span class="cx" style="display: block; padding: 0 10px">                                delete options.error;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Use with PHP's wp_send_json_success() and wp_send_json_error()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Use with PHP's wp_send_json_success() and wp_send_json_error().

</ins><span class="cx" style="display: block; padding: 0 10px">                                 deferred.jqXHR = $.ajax( options ).done( function( response ) {

<span class="cx" style="display: block; padding: 0 10px">                                        // Treat a response of 1 as successful for backward compatibility with existing handlers.

</span><span class="cx" style="display: block; padding: 0 10px">                                        if ( response === '1' || response === 1 ) {

</span></span></pre></div>

<a id="trunksrcjs_enqueueswputilswordcountjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/wp/utils/word-count.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/wp/utils/word-count.js     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/_enqueues/wp/utils/word-count.js       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,7 +3,8 @@

<span class="cx" style="display: block; padding: 0 10px">  * provided text string.

</span><span class="cx" style="display: block; padding: 0 10px">  *

</span><span class="cx" style="display: block; padding: 0 10px">  * @namespace wp.utils

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since     2.6.0

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *

+ * @since 2.6.0

</ins><span class="cx" style="display: block; padding: 0 10px">  * @output wp-admin/js/word-count.js

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,7 +74,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                spaceRegExp: /&nbsp;|&#160;/gi,

</span><span class="cx" style="display: block; padding: 0 10px">                HTMLEntityRegExp: /&\S+?;/g,

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // \u2014 = em-dash

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // \u2014 = em-dash.

</ins><span class="cx" style="display: block; padding: 0 10px">                 connectorRegExp: /--|\u2014/g,

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Characters to be removed from input text.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,10 +81,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                removeRegExp: new RegExp( [

</span><span class="cx" style="display: block; padding: 0 10px">                        '[',

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Basic Latin (extract)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Basic Latin (extract).

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '\u0021-\u0040\u005B-\u0060\u007B-\u007E',

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Latin-1 Supplement (extract)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Latin-1 Supplement (extract).

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '\u0080-\u00BF\u00D7\u00F7',

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                /*

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,7 +116,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                 */

</span><span class="cx" style="display: block; padding: 0 10px">                                '\u2000-\u2BFF',

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Supplemental Punctuation

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Supplemental Punctuation.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '\u2E00-\u2E7F',

</span><span class="cx" style="display: block; padding: 0 10px">                        ']'

</span><span class="cx" style="display: block; padding: 0 10px">                ].join( '' ), 'g' ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -143,7 +144,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Counts the number of words (or other specified type) in the specified text.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since    2.6.0

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @since 2.6.0

+        *

</ins><span class="cx" style="display: block; padding: 0 10px">          * @memberof wp.utils.wordcounter

</span><span class="cx" style="display: block; padding: 0 10px">         *

<span class="cx" style="display: block; padding: 0 10px">         * @param {String}  text Text to count elements in.

</span></span></pre></div>

<a id="trunksrcjsmediacontrollerscollectionaddjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/media/controllers/collection-add.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/media/controllers/collection-add.js  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/media/controllers/collection-add.js    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,8 +15,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.Model

</span><span class="cx" style="display: block; padding: 0 10px">  *

<span class="cx" style="display: block; padding: 0 10px">  * @param {object}                     [attributes]                         The attributes hash passed to the state.

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param {string}                     [attributes.id=library]      Unique identifier.

- * @param {string}                     attributes.title                    Title for the state. Displays in the frame's title region.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param {string}                     [attributes.id=library]              Unique identifier.

+ * @param {string}                     attributes.title                     Title for the state. Displays in the frame's title region.

</ins><span class="cx" style="display: block; padding: 0 10px">  * @param {boolean}                    [attributes.multiple=add]            Whether multi-select is enabled. @todo 'add' doesn't seem do anything special, and gets used as a boolean.

<span class="cx" style="display: block; padding: 0 10px">  * @param {wp.media.model.Attachments} [attributes.library]                 The attachments collection to browse.

<span class="cx" style="display: block; padding: 0 10px">  *                                                                          If one is not supplied, a collection of attachments of the specified type will be created.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,8 +34,8 @@

<span class="cx" style="display: block; padding: 0 10px">  * @param {int}                        [attributes.priority=100]            The priority for the state link in the media menu.

<span class="cx" style="display: block; padding: 0 10px">  * @param {boolean}                    [attributes.syncSelection=false]     Whether the Attachments selection should be persisted from the last state.

<span class="cx" style="display: block; padding: 0 10px">  *                                                                          Defaults to false because for this state, because the library of the Edit Gallery state is the selection.

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param {string}                     attributes.type                   The collection's media type. (e.g. 'video').

- * @param {string}                     attributes.collectionType         The collection type. (e.g. 'playlist').

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param {string}                     attributes.type                      The collection's media type. (e.g. 'video').

+ * @param {string}                     attributes.collectionType            The collection type. (e.g. 'playlist').

</ins><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> CollectionAdd = Library.extend(/** @lends wp.media.controller.CollectionAdd.prototype */{

</span><span class="cx" style="display: block; padding: 0 10px">        defaults: _.defaults( {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -87,9 +87,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        return !! this.mirroring.get( attachment.cid ) && ! edit.get( attachment.cid ) && Selection.prototype.validator.apply( this, arguments );

</span><span class="cx" style="display: block; padding: 0 10px">                };

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Reset the library to ensure that all attachments are re-added

-               // to the collection. Do so silently, as calling `observe` will

-               // trigger the `reset` event.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /*

+                * Reset the library to ensure that all attachments are re-added

+                * to the collection. Do so silently, as calling `observe` will

+                * trigger the `reset` event.

+                */

</ins><span class="cx" style="display: block; padding: 0 10px">                 library.reset( library.mirroring.models, { silent: true });

</span><span class="cx" style="display: block; padding: 0 10px">                library.observe( edit );

</span><span class="cx" style="display: block; padding: 0 10px">                this.set('editLibrary', edit);

</span></span></pre></div>

<a id="trunksrcjsmediacontrollersembedjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/media/controllers/embed.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/media/controllers/embed.js   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/media/controllers/embed.js     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -63,9 +63,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                scanners: []

</span><span class="cx" style="display: block; padding: 0 10px">                        };

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Scan is triggered with the list of `attributes` to set on the

-               // state, useful for the 'type' attribute and 'scanners' attribute,

-               // an array of promise objects for asynchronous scan operations.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /*

+                * Scan is triggered with the list of `attributes` to set on the

+                * state, useful for the 'type' attribute and 'scanners' attribute,

+                * an array of promise objects for asynchronous scan operations.

+                */

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( this.props.get('url') ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        this.trigger( 'scan', attributes );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span></span></pre></div>

<a id="trunksrcjsmediacontrollersstatejs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/media/controllers/state.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/media/controllers/state.js   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/media/controllers/state.js     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,8 +71,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">        reset: function() {},

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * @since 3.5.0

</ins><span class="cx" style="display: block; padding: 0 10px">          * @access private

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since 3.5.0

</del><span class="cx" style="display: block; padding: 0 10px">          */

</span><span class="cx" style="display: block; padding: 0 10px">        _ready: function() {

</span><span class="cx" style="display: block; padding: 0 10px">                this._updateMenu();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -79,8 +79,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * @since 3.5.0

</ins><span class="cx" style="display: block; padding: 0 10px">          * @access private

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since 3.5.0

</del><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        _preActivate: function() {

</span><span class="cx" style="display: block; padding: 0 10px">                this.active = true;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -87,8 +87,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * @since 3.5.0

</ins><span class="cx" style="display: block; padding: 0 10px">          * @access private

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since 3.5.0

</del><span class="cx" style="display: block; padding: 0 10px">          */

</span><span class="cx" style="display: block; padding: 0 10px">        _postActivate: function() {

</span><span class="cx" style="display: block; padding: 0 10px">                this.on( 'change:menu', this._menu, this );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,8 +106,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * @since 3.5.0

</ins><span class="cx" style="display: block; padding: 0 10px">          * @access private

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since 3.5.0

</del><span class="cx" style="display: block; padding: 0 10px">          */

</span><span class="cx" style="display: block; padding: 0 10px">        _deactivate: function() {

</span><span class="cx" style="display: block; padding: 0 10px">                this.active = false;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -121,8 +121,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * @since 3.5.0

</ins><span class="cx" style="display: block; padding: 0 10px">          * @access private

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since 3.5.0

</del><span class="cx" style="display: block; padding: 0 10px">          */

</span><span class="cx" style="display: block; padding: 0 10px">        _title: function() {

</span><span class="cx" style="display: block; padding: 0 10px">                this.frame.title.render( this.get('titleMode') || 'default' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -129,8 +129,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * @since 3.5.0

</ins><span class="cx" style="display: block; padding: 0 10px">          * @access private

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since 3.5.0

</del><span class="cx" style="display: block; padding: 0 10px">          */

</span><span class="cx" style="display: block; padding: 0 10px">        _renderTitle: function( view ) {

</span><span class="cx" style="display: block; padding: 0 10px">                view.$el.text( this.get('title') || '' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -137,8 +137,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * @since 3.5.0

</ins><span class="cx" style="display: block; padding: 0 10px">          * @access private

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since 3.5.0

</del><span class="cx" style="display: block; padding: 0 10px">          */

</span><span class="cx" style="display: block; padding: 0 10px">        _router: function() {

</span><span class="cx" style="display: block; padding: 0 10px">                var router = this.frame.router,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -159,8 +159,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * @since 3.5.0

</ins><span class="cx" style="display: block; padding: 0 10px">          * @access private

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since 3.5.0

</del><span class="cx" style="display: block; padding: 0 10px">          */

</span><span class="cx" style="display: block; padding: 0 10px">        _menu: function() {

</span><span class="cx" style="display: block; padding: 0 10px">                var menu = this.frame.menu,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -181,8 +181,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * @since 3.5.0

</ins><span class="cx" style="display: block; padding: 0 10px">          * @access private

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since 3.5.0

</del><span class="cx" style="display: block; padding: 0 10px">          */

</span><span class="cx" style="display: block; padding: 0 10px">        _updateMenu: function() {

</span><span class="cx" style="display: block; padding: 0 10px">                var previous = this.previous('menu'),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -200,8 +200,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Create a view in the media menu for the state.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * @since 3.5.0

</ins><span class="cx" style="display: block; padding: 0 10px">          * @access private

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since 3.5.0

</del><span class="cx" style="display: block; padding: 0 10px">          *

<span class="cx" style="display: block; padding: 0 10px">         * @param {media.view.Menu} view The menu view.

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span></span></pre></div>

<a id="trunksrcjsmediamodelsattachmentsjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/media/models/attachments.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/media/models/attachments.js  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/media/models/attachments.js    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -133,9 +133,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        return;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If no `Attachments` model is provided to source the searches

-               // from, then automatically generate a source from the existing

-               // models.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If no `Attachments` model is provided to source the searches from,

+               // then automatically generate a source from the existing models.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! this._source ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        this._source = new Attachments( this.models );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -326,10 +325,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! mirroring || ! mirroring.more ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return deferred.resolveWith( this ).promise();

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If we're mirroring another collection, forward `more` to

-               // the mirrored collection. Account for a race condition by

-               // checking if we're still mirroring that collection when

-               // the request resolves.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /*

+                * If we're mirroring another collection, forward `more` to

+                * the mirrored collection. Account for a race condition by

+                * checking if we're still mirroring that collection when

+                * the request resolves.

+                */

</ins><span class="cx" style="display: block; padding: 0 10px">                 mirroring.more( options ).done( function() {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( this === attachments.mirroring ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                deferred.resolveWith( this );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -412,9 +413,11 @@

</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">-                // Removes any uploading attachments, updates each attachment's

-               // menu order, and returns an object with an { id: menuOrder }

-               // mapping to pass to the request.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /*

+                * Removes any uploading attachments, updates each attachment's

+                * menu order, and returns an object with an { id: menuOrder }

+                * mapping to pass to the request.

+                */

</ins><span class="cx" style="display: block; padding: 0 10px">                 var attachments = this.chain().filter( function( attachment ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return ! _.isUndefined( attachment.id );

</span><span class="cx" style="display: block; padding: 0 10px">                }).map( function( attachment, index ) {

</span></span></pre></div>

<a id="trunksrcjsmediamodelspostimagejs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/media/models/post-image.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/media/models/post-image.js   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/media/models/post-image.js     2020-01-29 00:43:23 UTC (rev 47122)

</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">                        this.bindAttachmentListeners();

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // keep url in sync with changes to the type of link

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Keep URL in sync with changes to the type of link.

</ins><span class="cx" style="display: block; padding: 0 10px">                 this.on( 'change:link', this.updateLinkUrl, this );

</span><span class="cx" style="display: block; padding: 0 10px">                this.on( 'change:size', this.updateSize, this );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -70,7 +70,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        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">-                // default to custom if there is a linkUrl

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Default to custom if there is a linkUrl.

</ins><span class="cx" style="display: block; padding: 0 10px">                 type = 'custom';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( this.attachment ) {

</span></span></pre></div>

<a id="trunksrcjsmediamodelsqueryjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/media/models/query.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/media/models/query.js        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/media/models/query.js  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,15 +43,19 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                return true;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // We want any items that can be placed before the last

-                       // item in the set. If we add any items after the last

-                       // item, then we can't guarantee the set is complete.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 /*

+                        * We want any items that can be placed before the last

+                        * item in the set. If we add any items after the last

+                        * item, then we can't guarantee the set is complete.

+                        */

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( this.length ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                return 1 !== this.comparator( attachment, this.last(), { ties: 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">-                        // Handle the case where there are no items yet and

-                       // we're sorting for recent items. In that case, we want

-                       // changes that occurred after we created the query.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 /*

+                        * Handle the case where there are no items yet and

+                        * we're sorting for recent items. In that case, we want

+                        * changes that occurred after we created the query.

+                        */

</ins><span class="cx" style="display: block; padding: 0 10px">                         } else if ( 'DESC' === order && ( 'date' === orderby || 'modified' === orderby ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                return attachment.get( orderby ) >= this.created;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,12 +69,14 @@

</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">-                // Observe the central `wp.Uploader.queue` collection to watch for

-               // new matches for the query.

-               //

-               // Only observe when a limited number of query args are set. There

-               // are no filters for other properties, so observing will result in

-               // false positives in those queries.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /*

+                * Observe the central `wp.Uploader.queue` collection to watch for

+                * new matches for the query.

+                *

+                * Only observe when a limited number of query args are set. There

+                * are no filters for other properties, so observing will result in

+                * false positives in those queries.

+                */

</ins><span class="cx" style="display: block; padding: 0 10px">                 allowed = [ 's', 'order', 'orderby', 'posts_per_page', 'post_mime_type', 'post_parent', 'author' ];

</span><span class="cx" style="display: block; padding: 0 10px">                if ( wp.Uploader && _( this.args ).chain().keys().difference( allowed ).isEmpty().value() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        this.observe( wp.Uploader.queue );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -144,7 +150,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        options.data.query = args;

</span><span class="cx" style="display: block; padding: 0 10px">                        return wp.media.ajax( options );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Otherwise, fall back to Backbone.sync()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Otherwise, fall back to `Backbone.sync()`.

</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">                         * Call wp.media.model.Attachments.sync or Backbone.sync

</span></span></pre></div>

<a id="trunksrcjsmediaroutersmanagejs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/media/routers/manage.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/media/routers/manage.js      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/media/routers/manage.js        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,7 +16,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                'upload.php':                      'reset'

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Map routes against the page URL

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Map routes against the page URL.

</ins><span class="cx" style="display: block; padding: 0 10px">         baseUrl: function( url ) {

</span><span class="cx" style="display: block; padding: 0 10px">                return 'upload.php' + url;

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,12 +29,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Respond to the search route by filling the search field and trigggering the input event

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Respond to the search route by filling the search field and trigggering the input event.

</ins><span class="cx" style="display: block; padding: 0 10px">         search: function( query ) {

</span><span class="cx" style="display: block; padding: 0 10px">                jQuery( '#media-search-input' ).val( query ).trigger( 'input' );

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Show the modal with a specific item

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Show the modal with a specific item.

</ins><span class="cx" style="display: block; padding: 0 10px">         showItem: function( query ) {

</span><span class="cx" style="display: block; padding: 0 10px">                var media = wp.media,

</span><span class="cx" style="display: block; padding: 0 10px">                        frame = media.frames.browse,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,7 +41,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        library = frame.state().get('library'),

</span><span class="cx" style="display: block; padding: 0 10px">                        item;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Trigger the media frame to open the correct item

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Trigger the media frame to open the correct item.

</ins><span class="cx" style="display: block; padding: 0 10px">                 item = library.findWhere( { id: parseInt( query, 10 ) } );

</span><span class="cx" style="display: block; padding: 0 10px">                item.set( 'skipHistory', true );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunksrcjsmediautilsselectionsyncjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/media/utils/selection-sync.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/media/utils/selection-sync.js        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/media/utils/selection-sync.js  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,10 +22,12 @@

</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 the selection supports multiple items, validate the stored

-               // attachments based on the new selection's conditions. Record

-               // the attachments that are not included; we'll maintain a

-               // reference to those. Other attachments are considered in flux.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /*

+                * If the selection supports multiple items, validate the stored

+                * attachments based on the new selection's conditions. Record

+                * the attachments that are not included; we'll maintain a

+                * reference to those. Other attachments are considered in flux.

+                */

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( selection.multiple ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        selection.reset( [], { silent: true });

</span><span class="cx" style="display: block; padding: 0 10px">                        selection.validateAll( manager.attachments );

</span></span></pre></div>

<a id="trunksrcjsmediaviewsattachmentdetailsjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/media/views/attachment/details.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/media/views/attachment/details.js    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/media/views/attachment/details.js      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -146,10 +146,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        this.model.save().done( function() {

</span><span class="cx" style="display: block; padding: 0 10px">                                library._requery( 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">-                                 * @todo: We need to move focus back to the previous, next, or first

-                                * attachment but the library gets re-queried and refreshed. Thus,

-                                * the references to the previous attachments are lost. We need an

-                                * alternate method.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                          * @todo We need to move focus back to the previous, next, or first

+                                * attachment but the library gets re-queried and refreshed.

+                                * Thus, the references to the previous attachments are lost.

+                                * We need an alternate method.

</ins><span class="cx" style="display: block; padding: 0 10px">                                  */

</span><span class="cx" style="display: block; padding: 0 10px">                                self.moveFocusToLastFallback();

</span><span class="cx" style="display: block; padding: 0 10px">                        } );

</span></span></pre></div>

<a id="trunksrcjsmediaviewsattachmentjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/media/views/attachment.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/media/views/attachment.js    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/media/views/attachment.js      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -167,13 +167,13 @@

</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">-                // Catch arrow events

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Catch arrow events.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( 37 === event.keyCode || 38 === event.keyCode || 39 === event.keyCode || 40 === event.keyCode ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        this.controller.trigger( 'attachment:keydown:arrow', event );

</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">-                // Catch enter and space events

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Catch enter and space events.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( 'keydown' === event.type && 13 !== event.keyCode && 32 !== event.keyCode ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -183,7 +183,7 @@

<span class="cx" style="display: block; padding: 0 10px">                // In the grid view, bubble up an edit:attachment event to the controller.

</span><span class="cx" style="display: block; padding: 0 10px">                if ( this.controller.isModeActive( 'grid' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( this.controller.isModeActive( 'edit' ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Pass the current target to restore focus when closing

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Pass the current target to restore focus when closing.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 this.controller.trigger( 'edit:attachment', this.model, event.currentTarget );

</span><span class="cx" style="display: block; padding: 0 10px">                                return;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -255,7 +255,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">-                // Fixes bug that loses focus when selecting a featured image

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Fixes bug that loses focus when selecting a featured image.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! method ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        method = 'add';

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -265,14 +265,18 @@

</span><span class="cx" style="display: 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 ( this.selected() ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // If the model is the single model, remove it.

-                       // If it is not the same as the single model,

-                       // it now becomes the single model.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 /*

+                        * If the model is the single model, remove it.

+                        * If it is not the same as the single model,

+                        * it now becomes the single model.

+                        */

</ins><span class="cx" style="display: block; padding: 0 10px">                         selection[ single === model ? 'remove' : 'single' ]( model );

</span><span class="cx" style="display: block; padding: 0 10px">                } else {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // If the model is not selected, run the `method` on the

-                       // selection. By default, we `reset` the selection, but the

-                       // `method` can be set to `add` the model to the selection.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 /*

+                        * If the model is not selected, run the `method` on the

+                        * selection. By default, we `reset` the selection, but the

+                        * `method` can be set to `add` the model to the selection.

+                        */

</ins><span class="cx" style="display: block; padding: 0 10px">                         selection[ method ]( model );

</span><span class="cx" style="display: block; padding: 0 10px">                        selection.single( model );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -298,9 +302,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                var selection = this.options.selection,

</span><span class="cx" style="display: block; padding: 0 10px">                        controller = this.controller;

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check if a selection exists and if it's the collection provided.

-               // If they're not the same collection, bail; we're in another

-               // selection's event loop.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /*

+                * Check if a selection exists and if it's the collection provided.

+                * If they're not the same collection, bail; we're in another

+                * selection's event loop.

+                */

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! selection || ( collection && collection !== selection ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -324,9 +330,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">        deselect: function( model, collection ) {

</span><span class="cx" style="display: block; padding: 0 10px">                var selection = this.options.selection;

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check if a selection exists and if it's the collection provided.

-               // If they're not the same collection, bail; we're in another

-               // selection's event loop.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /*

+                * Check if a selection exists and if it's the collection provided.

+                * If they're not the same collection, bail; we're in another

+                * selection's event loop.

+                */

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! selection || ( collection && collection !== selection ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -478,7 +486,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @param {Object} event

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        removeFromLibrary: function( event ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Catch enter and space events

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Catch enter and space events.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( 'keydown' === event.type && 13 !== event.keyCode && 32 !== event.keyCode ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -565,10 +573,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        return this;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If the updated value is in sync with the value in the DOM, there

-               // is no need to re-render. If we're currently editing the value,

-               // it will automatically be in sync, suppressing the re-render for

-               // the view we're editing, while updating any others.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /*

+                * If the updated value is in sync with the value in the DOM, there

+                * is no need to re-render. If we're currently editing the value,

+                * it will automatically be in sync, suppressing the re-render for

+                * the view we're editing, while updating any others.

+                */

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( value === $setting.find('input, textarea, select, [value]').val() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return this;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span></span></pre></div>

<a id="trunksrcjsmediaviewsattachmentsbrowserjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/media/views/attachments/browser.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/media/views/attachments/browser.js   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/media/views/attachments/browser.js     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -194,9 +194,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Feels odd to bring the global media library switcher into the Attachment

-               // browser view. Is this a use case for doAction( 'add:toolbar-items:attachments-browser', this.toolbar );

-               // which the controller can tap into and add this view?

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /*

+                * Feels odd to bring the global media library switcher into the Attachment browser view.

+                * Is this a use case for doAction( 'add:toolbar-items:attachments-browser', this.toolbar );

+                * which the controller can tap into and add this view?

+                */

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( this.controller.isModeActive( 'grid' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        LibraryViewSwitcher = View.extend({

</span><span class="cx" style="display: block; padding: 0 10px">                                className: 'view-switch media-grid-view-switch',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -222,7 +224,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                priority: -75

</span><span class="cx" style="display: block; padding: 0 10px">                        }).render() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // BulkSelection is a <div> with subviews, including screen reader text

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // BulkSelection is a <div> with subviews, including screen reader text.

</ins><span class="cx" style="display: block; padding: 0 10px">                         this.toolbar.set( 'selectModeToggleButton', new wp.media.view.SelectModeToggleButton({

</span><span class="cx" style="display: block; padding: 0 10px">                                text: l10n.bulkSelect,

</span><span class="cx" style="display: block; padding: 0 10px">                                controller: this.controller,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -437,7 +439,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        AttachmentView: this.options.AttachmentView

</span><span class="cx" style="display: block; padding: 0 10px">                });

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Add keydown listener to the instance of the Attachments view

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Add keydown listener to the instance of the Attachments view.

</ins><span class="cx" style="display: block; padding: 0 10px">                 this.controller.on( 'attachment:keydown:arrow',     _.bind( this.attachments.arrowEvent, this.attachments ) );

</span><span class="cx" style="display: block; padding: 0 10px">                this.controller.on( 'attachment:details:shift-tab', _.bind( this.attachments.restoreFocus, this.attachments ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -516,7 +518,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">-                // Show the sidebar on mobile

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Show the sidebar on mobile.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( this.model.id === 'insert' ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        sidebar.$el.addClass( 'visible' );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -527,7 +529,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                sidebar.unset('details');

</span><span class="cx" style="display: block; padding: 0 10px">                sidebar.unset('compat');

</span><span class="cx" style="display: block; padding: 0 10px">                sidebar.unset('display');

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Hide the sidebar on mobile

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Hide the sidebar on mobile.

</ins><span class="cx" style="display: block; padding: 0 10px">                 sidebar.$el.removeClass( 'visible' );

</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="trunksrcjsmediaviewsattachmentsjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/media/views/attachments.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/media/views/attachments.js   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/media/views/attachments.js     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -131,11 +131,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        attachmentFocus: function() {

</span><span class="cx" style="display: block; padding: 0 10px">                /*

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 * @todo: when uploading new attachments, this tries to move focus to the

-                * attachmentz grid. Actually, a progress bar gets initially displayed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+          * @todo When uploading new attachments, this tries to move focus to

+                * the attachments grid. Actually, a progress bar gets initially displayed

</ins><span class="cx" style="display: block; padding: 0 10px">                  * and then updated when uploading completes, so focus is lost.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 * Additionally: this view is used for both the attachments list and the

-                * list of selected attachments in the bottom media toolbar. Thus, when

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+          * Additionally: this view is used for both the attachments list and

+                * the list of selected attachments in the bottom media toolbar. Thus, when

</ins><span class="cx" style="display: block; padding: 0 10px">                  * uploading attachments, it is called twice and returns two different `this`.

<span class="cx" style="display: block; padding: 0 10px">                 * `this.columns` is truthy within the modal.

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</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">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Initializes jQuery sortable on the attachment list.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Fails gracefully if jQuery sortable doesn't exist or isn't passed in the

-        * options.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Fails gracefully if jQuery sortable doesn't exist or isn't passed

+        * in the options.

</ins><span class="cx" style="display: block; padding: 0 10px">          *

</span><span class="cx" style="display: block; padding: 0 10px">         * @since 3.5.0

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -278,8 +278,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        disabled: !! collection.comparator,

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        /*

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                         * Change the position of the attachment as soon as the mouse pointer overlaps a

-                        * thumbnail.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                  * Change the position of the attachment as soon as the mouse pointer

+                        * overlaps a thumbnail.

</ins><span class="cx" style="display: block; padding: 0 10px">                          */

</span><span class="cx" style="display: block; padding: 0 10px">                        tolerance: 'pointer',

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -321,8 +321,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }, this.options.sortable ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                /*

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 * If the `orderby` property is changed on the `collection`, check to see if we

-                * have a `comparator`. If so, disable sorting.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+          * If the `orderby` property is changed on the `collection`,

+                * check to see if we have a `comparator`. If so, disable sorting.

</ins><span class="cx" style="display: block; padding: 0 10px">                  */

</span><span class="cx" style="display: block; padding: 0 10px">                collection.props.on( 'change:orderby', function() {

</span><span class="cx" style="display: block; padding: 0 10px">                        this.$el.sortable( 'option', 'disabled', !! collection.comparator );

</span></span></pre></div>

<a id="trunksrcjsmediaviewsbuttonselectmodetogglejs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/media/views/button/select-mode-toggle.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/media/views/button/select-mode-toggle.js     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/media/views/button/select-mode-toggle.js       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,7 +49,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                children = toolbar.$( '.media-toolbar-secondary > *, .media-toolbar-primary > *' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // TODO: the Frame should be doing all of this.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // @todo The Frame should be doing all of this.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( this.controller.isModeActive( 'select' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        this.model.set( {

</span><span class="cx" style="display: block; padding: 0 10px">                                size: 'large',

</span></span></pre></div>

<a id="trunksrcjsmediaviewsembedlinkjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/media/views/embed/link.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/media/views/embed/link.js    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/media/views/embed/link.js      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,11 +23,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">        updateoEmbed: _.debounce( function() {

</span><span class="cx" style="display: block; padding: 0 10px">                var url = this.model.get( 'url' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // clear out previous results

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Clear out previous results.

</ins><span class="cx" style="display: block; padding: 0 10px">                 this.$('.embed-container').hide().find('.embed-preview').empty();

</span><span class="cx" style="display: block; padding: 0 10px">                this.$( '.setting' ).hide();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // only proceed with embed if the field contains more than 11 characters

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Only proceed with embed if the field contains more than 11 characters.

</ins><span class="cx" style="display: block; padding: 0 10px">                 // Example: http://a.io is 11 chars

</span><span class="cx" style="display: block; padding: 0 10px">                if ( url && ( url.length < 11 || ! url.match(/^http(s)?:\/\//) ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,7 +39,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        fetch: function() {

</span><span class="cx" style="display: block; padding: 0 10px">                var url = this.model.get( 'url' ), re, youTubeEmbedMatch;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // check if they haven't typed in 500 ms

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check if they haven't typed in 500 ms.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $('#embed-url-field').val() !== url ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span></span></pre></div>

<a id="trunksrcjsmediaviewsfocusmanagerjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/media/views/focus-manager.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/media/views/focus-manager.js 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/media/views/focus-manager.js   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,7 +91,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                tabbables = this.getTabbables();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Keep tab focus within media modal while it's open

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Keep tab focus within media modal while it's open.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( tabbables.last()[0] === event.target && ! event.shiftKey ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        tabbables.first().focus();

</span><span class="cx" style="display: block; padding: 0 10px">                        return false;

</span></span></pre></div>

<a id="trunksrcjsmediaviewsframeeditattachmentsjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/media/views/frame/edit-attachments.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/media/views/frame/edit-attachments.js        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/media/views/frame/edit-attachments.js  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -255,11 +255,11 @@

</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">-                // The right arrow key

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // The right arrow key.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( 39 === event.keyCode ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        this.nextMediaItem();

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // The left arrow key

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // The left arrow key.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( 37 === event.keyCode ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        this.previousMediaItem();

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span></span></pre></div>

<a id="trunksrcjsmediaviewsframeimagedetailsjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/media/views/frame/image-details.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/media/views/frame/image-details.js   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/media/views/frame/image-details.js     2020-01-29 00:43:23 UTC (rev 47122)

</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">                this.on( 'content:create:image-details', this.imageDetailsContent, this );

</span><span class="cx" style="display: block; padding: 0 10px">                this.on( 'content:render:edit-image', this.editImageContent, this );

</span><span class="cx" style="display: block; padding: 0 10px">                this.on( 'toolbar:render:image-details', this.renderImageDetailsToolbar, this );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // override the select toolbar

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Override the select toolbar.

</ins><span class="cx" style="display: block; padding: 0 10px">                 this.on( 'toolbar:render:replace', this.renderReplaceImageToolbar, this );

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,7 +91,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                this.content.set( view );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // after bringing in the frame, load the actual editor via an ajax call

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // After bringing in the frame, load the actual editor via an Ajax call.

</ins><span class="cx" style="display: block; padding: 0 10px">                 view.loadEditor();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -111,8 +111,8 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                                controller.close();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                // not sure if we want to use wp.media.string.image which will create a shortcode or

-                                               // perhaps wp.html.string to at least to build the <img />

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         // Not sure if we want to use wp.media.string.image which will create a shortcode or

+                                               // perhaps wp.html.string to at least to build the <img />.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                 state.trigger( 'update', controller.image.toJSON() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                                                // Restore and reset the default state.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -160,8 +160,8 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                                controller.image.changeAttachment( attachment, state.display( 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">-                                                // not sure if we want to use wp.media.string.image which will create a shortcode or

-                                               // perhaps wp.html.string to at least to build the <img />

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         // Not sure if we want to use wp.media.string.image which will create a shortcode or

+                                               // perhaps wp.html.string to at least to build the <img />.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                 state.trigger( 'replace', controller.image.toJSON() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                                                // Restore and reset the default state.

</span></span></pre></div>

<a id="trunksrcjsmediaviewsframemanagejs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/media/views/frame/manage.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/media/views/frame/manage.js  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/media/views/frame/manage.js    2020-01-29 00:43:23 UTC (rev 47122)

</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">                                }

</span><span class="cx" style="display: block; padding: 0 10px">                        }, 1000 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Update the URL when entering search string (at most once per second)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Update the URL when entering search string (at most once per second).

</ins><span class="cx" style="display: block; padding: 0 10px">                 search.on( 'input', _.bind( input, this ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                this.gridRouter

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -183,7 +183,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $browser = this.$('.attachments-browser');

</span><span class="cx" style="display: block; padding: 0 10px">                $toolbar = $browser.find('.media-toolbar');

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Offset doesn't appear to take top margin into account, hence +16

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Offset doesn't appear to take top margin into account, hence +16.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ( $browser.offset().top + 16 ) < this.$window.scrollTop() + this.$adminBar.height() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $browser.addClass( 'fixed' );

</span><span class="cx" style="display: block; padding: 0 10px">                        $toolbar.css('width', $browser.width() + 'px');

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -271,7 +271,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">        startHistory: function() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Verify pushState support and activate

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Verify pushState support and activate.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( window.history && window.history.pushState ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( Backbone.History.started ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                Backbone.history.stop();

</span></span></pre></div>

<a id="trunksrcjsmediaviewsframepostjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/media/views/frame/post.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/media/views/frame/post.js    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/media/views/frame/post.js      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -180,7 +180,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                this.on( 'activate', this.activate, this );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Only bother checking media type counts if one of the counts is zero

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Only bother checking media type counts if one of the counts is zero.

</ins><span class="cx" style="display: block; padding: 0 10px">                 checkCounts = _.find( this.counts, function( type ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return type.count === 0;

</span><span class="cx" style="display: block; padding: 0 10px">                } );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -235,7 +235,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        activate: function() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Hide menu items for states tied to particular media types if there are no items

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Hide menu items for states tied to particular media types if there are no items.

</ins><span class="cx" style="display: block; padding: 0 10px">                 _.each( this.counts, function( type ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( type.count < 1 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                this.menuItemVisibility( type.state, 'hide' );

</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">                }

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Menus

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Menus.

</ins><span class="cx" style="display: block; padding: 0 10px">         /**

</span><span class="cx" style="display: block; padding: 0 10px">         * @param {wp.Backbone.View} view

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -358,7 +358,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">-        // Content

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Content.

</ins><span class="cx" style="display: block; padding: 0 10px">         embedContent: function() {

</span><span class="cx" style="display: block; padding: 0 10px">                var view = new wp.media.view.Embed({

</span><span class="cx" style="display: block; padding: 0 10px">                        controller: this,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -400,7 +400,7 @@

<span class="cx" style="display: block; padding: 0 10px">                // Browse our library of attachments.

</span><span class="cx" style="display: block; padding: 0 10px">                this.content.set( view );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Trigger the controller to set focus

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Trigger the controller to set focus.

</ins><span class="cx" style="display: block; padding: 0 10px">                 this.trigger( 'edit:selection', this );

</span><span class="cx" style="display: block; padding: 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,12 +410,12 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                this.content.set( view );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // after creating the wrapper view, load the actual editor via an ajax call

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // After creating the wrapper view, load the actual editor via an Ajax call.

</ins><span class="cx" style="display: block; padding: 0 10px">                 view.loadEditor();

</span><span class="cx" style="display: 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">-        // Toolbars

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Toolbars.

</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">         * @param {wp.Backbone.View} view

</span></span></pre></div>

<a id="trunksrcjsmediaviewsframeselectjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/media/views/frame/select.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/media/views/frame/select.js  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/media/views/frame/select.js    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -64,7 +64,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                this.content.set( view );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // after creating the wrapper view, load the actual editor via an ajax call

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // After creating the wrapper view, load the actual editor via an Ajax call.

</ins><span class="cx" style="display: block; padding: 0 10px">                 view.loadEditor();

</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="trunksrcjsmediaviewsimagedetailsjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/media/views/image-details.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/media/views/image-details.js 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/media/views/image-details.js   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,7 +27,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                'keyup [data-setting="customHeight"]': 'onCustomSize'

</span><span class="cx" style="display: block; padding: 0 10px">        } ),

</span><span class="cx" style="display: block; padding: 0 10px">        initialize: function() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // used in AttachmentDisplay.prototype.updateLinkTo

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Used in AttachmentDisplay.prototype.updateLinkTo.

</ins><span class="cx" style="display: block; padding: 0 10px">                 this.options.attachment = this.model.attachment;

</span><span class="cx" style="display: block; padding: 0 10px">                this.listenTo( this.model, 'change:url', this.updateUrl );

</span><span class="cx" style="display: block; padding: 0 10px">                this.listenTo( this.model, 'change:link', this.toggleLinkSettings );

</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">                        num = $( event.target ).val(),

</span><span class="cx" style="display: block; padding: 0 10px">                        value;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Ignore bogus input

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Ignore bogus input.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! /^\d+/.test( num ) || parseInt( num, 10 ) < 1 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        event.preventDefault();

</span><span class="cx" style="display: block; padding: 0 10px">                        return;

</span></span></pre></div>

<a id="trunksrcjsmediaviewsmenuitemjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/media/views/menu-item.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/media/views/menu-item.js     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/media/views/menu-item.js       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,7 +42,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                if ( state ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        this.controller.setState( state );

<span class="cx" style="display: block; padding: 0 10px">                        // Toggle the menu visibility in the responsive view.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        this.views.parent.$el.removeClass( 'visible' ); // TODO: or hide on any click, see below

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 this.views.parent.$el.removeClass( 'visible' ); // @todo Or hide on any click, see below.

</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="trunksrcjsmediaviewsmodaljs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/media/views/modal.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/media/views/modal.js 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/media/views/modal.js   2020-01-29 00:43:23 UTC (rev 47122)

</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"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $el.show();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Try to close the onscreen keyboard

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Try to close the onscreen keyboard.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( 'ontouchend' in document ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ( mceEditor = window.tinymce && window.tinymce.activeEditor ) && ! mceEditor.isHidden() && mceEditor.iframeElement ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                mceEditor.iframeElement.focus();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -135,7 +135,7 @@

<span class="cx" style="display: block; padding: 0 10px">                // Enable page scrolling.

</span><span class="cx" style="display: block; padding: 0 10px">                $( 'body' ).removeClass( 'modal-open' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Hide modal and remove restricted media modal tab focus once it's closed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Hide modal and remove restricted media modal tab focus once it's closed.

</ins><span class="cx" style="display: block; padding: 0 10px">                 this.$el.hide().undelegate( 'keydown' );

</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="trunksrcjsmediaviewstoolbarjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/media/views/toolbar.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/media/views/toolbar.js       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/media/views/toolbar.js 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -142,7 +142,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        var requires = button.options.requires,

</span><span class="cx" style="display: block; padding: 0 10px">                                disabled = 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">-                        // Prevent insertion of attachments if any of them are still uploading

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Prevent insertion of attachments if any of them are still uploading.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( selection && selection.models ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                disabled = _.some( selection.models, function( attachment ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        return attachment.get('uploading') === true;

</span></span></pre></div>

<a id="trunksrcjsmediaviewsuploaderinlinejs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/media/views/uploader/inline.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/media/views/uploader/inline.js       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/media/views/uploader/inline.js 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -70,9 +70,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        return View.prototype.dispose.apply( this, arguments );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Run remove on `dispose`, so we can be sure to refresh the

-               // uploader with a view-less DOM. Track whether we're disposing

-               // so we don't trigger an infinite loop.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /*

+                * Run remove on `dispose`, so we can be sure to refresh the

+                * uploader with a view-less DOM. Track whether we're disposing

+                * so we don't trigger an infinite loop.

+                */

</ins><span class="cx" style="display: block; padding: 0 10px">                 this.disposing = true;

</span><span class="cx" style="display: block; padding: 0 10px">                return this.remove();

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span></span></pre></div>

<a id="trunksrcjsmediaviewsviewjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/media/views/view.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/media/views/view.js  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/js/media/views/view.js    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,9 +31,11 @@

<span class="cx" style="display: block; padding: 0 10px">         * @return {wp.media.View} Returns itself to allow chaining.

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        dispose: function() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Undelegating events, removing events from the model, and

-               // removing events from the controller mirror the code for

-               // `Backbone.View.dispose` in Backbone 0.9.8 development.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /*

+                * Undelegating events, removing events from the model, and

+                * removing events from the controller mirror the code for

+                * `Backbone.View.dispose` in Backbone 0.9.8 development.

+                */

</ins><span class="cx" style="display: block; padding: 0 10px">                 this.undelegateEvents();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( this.model && this.model.off ) {

</span></span></pre></div>

<a id="trunksrcwpactivatephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-activate.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-activate.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-activate.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -68,7 +68,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $wp_object_cache->cache_enabled = 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">-// Fix for page title

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Fix for page title.

</ins><span class="cx" style="display: block; padding: 0 10px"> $wp_query->is_404 = false;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> /**

</span></span></pre></div>

<a id="trunksrcwpadmin_indexphp"></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/_index.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/_index.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/_index.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,7 +44,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">-// Help tabs

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Help tabs.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> $help  = '<p>' . __( 'The left-hand navigation menu provides links to all of the WordPress administration screens, with submenu items displayed on hover. You can minimize this menu to a narrow icon strip by clicking on the Collapse Menu arrow at the bottom.' ) . '</p>';

</span><span class="cx" style="display: block; padding: 0 10px"> $help .= '<p>' . __( 'Links in the Toolbar at the top of the screen connect your dashboard and the front end of your site, and provide access to your profile and helpful WordPress information.' ) . '</p>';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -119,7 +119,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $classes = 'welcome-panel';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $option = get_user_meta( get_current_user_id(), 'show_welcome_panel', true );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // 0 = hide, 1 = toggled to show or single site creator, 2 = multisite site owner

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // 0 = hide, 1 = toggled to show or single site creator, 2 = multisite site owner.

</ins><span class="cx" style="display: block; padding: 0 10px">         $hide = 0 == $option || ( 2 == $option && wp_get_current_user()->user_email != get_option( 'admin_email' ) );

</span><span class="cx" style="display: block; padding: 0 10px">        if ( $hide ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $classes .= ' hidden';

</span></span></pre></div>

<a id="trunksrcwpadminadminajaxphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/admin-ajax.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/admin-ajax.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/admin-ajax.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,7 +27,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> header( 'X-Robots-Tag: noindex' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Require an action parameter

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Require an action parameter.

</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $_REQUEST['action'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">        wp_die( '0', 400 );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</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">        'health-check-get-sizes',

</span><span class="cx" style="display: block; padding: 0 10px"> );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Deprecated

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Deprecated.

</ins><span class="cx" style="display: block; padding: 0 10px"> $core_actions_post_deprecated = array( 'wp-fullscreen-save-post', 'press-this-save-post', 'press-this-add-category' );

</span><span class="cx" style="display: block; padding: 0 10px"> $core_actions_post            = array_merge( $core_actions_post, $core_actions_post_deprecated );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -189,5 +189,5 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        do_action( "wp_ajax_nopriv_{$action}" );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Default status

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Default status.

</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die( '0' );

</span></span></pre></div>

<a id="trunksrcwpadminadminfooterphp"></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-footer.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/admin-footer.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/admin-footer.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,7 +6,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">  * @subpackage Administration

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// don't load directly

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Don't load directly.

</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! defined( 'ABSPATH' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">        die( '-1' );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -104,7 +104,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> do_action( "admin_footer-{$hook_suffix}" ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// get_site_option() won't exist when auto upgrading from <= 2.7

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// get_site_option() won't exist when auto upgrading from <= 2.7.

</ins><span class="cx" style="display: block; padding: 0 10px"> if ( function_exists( 'get_site_option' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">        if ( false === get_site_option( 'can_compress_scripts' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                compression_test();

</span></span></pre></div>

<a id="trunksrcwpadminadminphp"></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.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/admin.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/admin.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -93,12 +93,12 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> auth_redirect();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Schedule trash collection

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Schedule trash collection.

</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! wp_next_scheduled( 'wp_scheduled_delete' ) && ! wp_installing() ) {

</span><span class="cx" style="display: block; padding: 0 10px">        wp_schedule_event( time(), 'daily', 'wp_scheduled_delete' );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Schedule Transient cleanup.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Schedule transient cleanup.

</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! wp_next_scheduled( 'delete_expired_transients' ) && ! wp_installing() ) {

</span><span class="cx" style="display: block; padding: 0 10px">        wp_schedule_event( time(), 'daily', 'delete_expired_transients' );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -182,7 +182,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Back-compat for plugins using add_management_page().

</span><span class="cx" style="display: block; padding: 0 10px">                if ( empty( $page_hook ) && 'edit.php' == $pagenow && '' != get_plugin_page_hook( $plugin_page, 'tools.php' ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // There could be plugin specific params on the URL, so we need the whole query string

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // There could be plugin specific params on the URL, so we need the whole query string.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( ! empty( $_SERVER['QUERY_STRING'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $query_string = $_SERVER['QUERY_STRING'];

</span><span class="cx" style="display: block; padding: 0 10px">                        } else {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -347,7 +347,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        include( ABSPATH . 'wp-admin/admin-footer.php' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Make sure rules are flushed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Make sure rules are flushed.

</ins><span class="cx" style="display: block; padding: 0 10px">         flush_rewrite_rules( false );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        exit();

</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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/async-upload.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,7 +38,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        wp_die( __( 'Sorry, you are not allowed to upload files.' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// just fetch the detail form for that attachment

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Just fetch the detail form for that attachment.

</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_REQUEST['attachment_id'] ) && intval( $_REQUEST['attachment_id'] ) && $_REQUEST['fetch'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">        $id   = intval( $_REQUEST['attachment_id'] );

</span><span class="cx" style="display: block; padding: 0 10px">        $post = get_post( $id );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -112,7 +112,7 @@

<span class="cx" style="display: block; padding: 0 10px">        // Short form response - attachment ID only.

</span><span class="cx" style="display: block; padding: 0 10px">        echo $id;

</span><span class="cx" style="display: block; padding: 0 10px"> } else {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Long form response - big chunk of html.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Long form response - big chunk of HTML.

</ins><span class="cx" style="display: block; padding: 0 10px">         $type = $_REQUEST['type'];

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span></span></pre></div>

<a id="trunksrcwpadmincommentphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/comment.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/comment.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/comment.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -137,7 +137,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                break;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( $comment->comment_approved != '0' ) { // if not unapproved

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( $comment->comment_approved != '0' ) { // If not unapproved.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $message = '';

</span><span class="cx" style="display: block; padding: 0 10px">                        switch ( $comment->comment_approved ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                case '1':

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -355,6 +355,6 @@

</span><span class="cx" style="display: block; padding: 0 10px">        default:

</span><span class="cx" style="display: block; padding: 0 10px">                wp_die( __( 'Unknown action.' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-} // end switch

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+} // End switch.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> include( ABSPATH . 'wp-admin/admin-footer.php' );

</span></span></pre></div>

<a id="trunksrcwpadmincreditsphp"></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/credits.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/credits.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/credits.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -133,7 +133,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> return;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// These are strings returned by the API that we want to be translatable

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// These are strings returned by the API that we want to be translatable.

</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'Project Leaders' );

</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: The current WordPress version number. */

</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Core Contributors to WordPress %s' );

</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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/edit-comments.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,7 +52,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        wp_defer_comment_counting( 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">-        foreach ( $comment_ids as $comment_id ) { // Check the permissions on each

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $comment_ids as $comment_id ) { // Check the permissions on each.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! current_user_can( 'edit_comment', $comment_id ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        continue;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span></span></pre></div>

<a id="trunksrcwpadmineditformadvancedphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/edit-form-advanced.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit-form-advanced.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/edit-form-advanced.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,7 +6,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">  * @subpackage Administration

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// don't load directly

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Don't load directly.

</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! defined( 'ABSPATH' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">        die( '-1' );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -95,7 +95,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        wp_enqueue_media( array( 'post' => $post_ID ) );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Add the local autosave notice HTML

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Add the local autosave notice HTML.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'admin_footer', '_local_storage_notice' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> /*

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -242,7 +242,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> $nonce_action = 'update-post_' . $post_ID;

</span><span class="cx" style="display: block; padding: 0 10px"> $form_extra  .= "<input type='hidden' id='post_ID' name='post_ID' value='" . esc_attr( $post_ID ) . "' />";

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Detect if there exists an autosave newer than the post and if that autosave is different than the post

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Detect if there exists an autosave newer than the post and if that autosave is different than the post.

</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $autosave && mysql2date( 'U', $autosave->post_modified_gmt, false ) > mysql2date( 'U', $post->post_modified_gmt, false ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">        foreach ( _wp_post_revision_fields( $post ) as $autosave_field => $_autosave_field ) {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( normalize_whitespace( $autosave->$autosave_field ) != normalize_whitespace( $post->$autosave_field ) ) {

</span></span></pre></div>

<a id="trunksrcwpadmineditformblocksphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/edit-form-blocks.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit-form-blocks.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/edit-form-blocks.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +8,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">  * @subpackage Administration

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// don't load directly

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Don't load directly.

</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! defined( 'ABSPATH' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">        die( '-1' );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -148,10 +148,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> $allowed_block_types = apply_filters( 'allowed_block_types', true, $post );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Get all available templates for the post/page attributes meta-box.

-// The "Default template" array element should only be added if the array is

-// not empty so we do not trigger the template select element without any options

-// besides the default value.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/*

+ * Get all available templates for the post/page attributes meta-box.

+ * The "Default template" array element should only be added if the array is

+ * not empty so we do not trigger the template select element without any options

+ * besides the default value.

+ */

</ins><span class="cx" style="display: block; padding: 0 10px"> $available_templates = wp_get_theme()->get_page_templates( get_post( $post->ID ) );

</span><span class="cx" style="display: block; padding: 0 10px"> $available_templates = ! empty( $available_templates ) ? array_merge(

</span><span class="cx" style="display: block; padding: 0 10px">        array(

</span></span></pre></div>

<a id="trunksrcwpadmineditformcommentphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/edit-form-comment.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit-form-comment.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/edit-form-comment.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,7 +6,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">  * @subpackage Administration

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// don't load directly

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Don't load directly.

</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! defined( 'ABSPATH' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">        die( '-1' );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span></span></pre></div>

<a id="trunksrcwpadmineditlinkformphp"></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-link-form.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit-link-form.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/edit-link-form.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,7 +6,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">  * @subpackage Administration

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// don't load directly

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Don't load directly.

</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! defined( 'ABSPATH' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">        die( '-1' );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span></span></pre></div>

<a id="trunksrcwpadminedittagformphp"></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-tag-form.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit-tag-form.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/edit-tag-form.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,12 +6,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">  * @subpackage Administration

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// don't load directly

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Don't load directly.

</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! defined( 'ABSPATH' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">        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">-// Back compat hooks

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Back compat hooks.

</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'category' == $taxonomy ) {

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Fires before the Edit Category form.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -191,7 +191,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        <p class="description"><?php _e( 'The description is not prominent by default; however, some themes may show it.' ); ?></p></td>

</span><span class="cx" style="display: block; padding: 0 10px">                </tr>

</span><span class="cx" style="display: block; padding: 0 10px">                <?php

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Back compat hooks

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Back compat hooks.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( 'category' == $taxonomy ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        /**

<span class="cx" style="display: block; padding: 0 10px">                         * Fires after the Edit Category form fields are displayed.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -238,7 +238,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                ?>

</span><span class="cx" style="display: block; padding: 0 10px">        </table>

</span><span class="cx" style="display: block; padding: 0 10px"> <?php

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Back compat hooks

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Back compat hooks.

</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'category' == $taxonomy ) {

</span><span class="cx" style="display: block; padding: 0 10px">        /** This action is documented in wp-admin/edit-tags.php */

</span><span class="cx" style="display: block; padding: 0 10px">        do_action_deprecated( 'edit_category_form', array( $tag ), '3.0.0', '{$taxonomy}_add_form' );

</span></span></pre></div>

<a id="trunksrcwpadminedittagsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/edit-tags.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit-tags.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/edit-tags.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -204,7 +204,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $tags   = (array) $_REQUEST['delete_tags'];

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                /** This action is documented in wp-admin/edit.php */

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $location = apply_filters( "handle_bulk_actions-{$screen}", $location, $wp_list_table->current_action(), $tags );  // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $location = apply_filters( "handle_bulk_actions-{$screen}", $location, $wp_list_table->current_action(), $tags ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores

</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></pre></div>

<a id="trunksrcwpadmineditphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/edit.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/edit.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -47,7 +47,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> $wp_list_table = _get_list_table( 'WP_Posts_List_Table' );

</span><span class="cx" style="display: block; padding: 0 10px"> $pagenum       = $wp_list_table->get_pagenum();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Back-compat for viewing comments of an entry

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Back-compat for viewing comments of an entry.

</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( array( 'p', 'attachment_id', 'page_id' ) as $_redirect ) {

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! empty( $_REQUEST[ $_redirect ] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                wp_redirect( admin_url( 'edit-comments.php?p=' . absint( $_REQUEST[ $_redirect ] ) ) );

</span></span></pre></div>

<a id="trunksrcwpadminimportphp"></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/import.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/import.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/import.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,7 +39,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $popular_importers = array();

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Detect and redirect invalid importers like 'movabletype', which is registered as 'mt'

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Detect and redirect invalid importers like 'movabletype', which is registered as 'mt'.

</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $_GET['invalid'] ) && isset( $popular_importers[ $_GET['invalid'] ] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">        $importer_id = $popular_importers[ $_GET['invalid'] ]['importer-id'];

</span><span class="cx" style="display: block; padding: 0 10px">        if ( $importer_id != $_GET['invalid'] ) { // Prevent redirect loops.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -93,7 +93,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( $importers ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        echo '<p>' . __( 'No importers are available.' ) . '</p>'; // TODO: make more helpful

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo '<p>' . __( 'No importers are available.' ) . '</p>'; // TODO: Make more helpful.

</ins><span class="cx" style="display: block; padding: 0 10px"> } else {

</span><span class="cx" style="display: block; padding: 0 10px">        uasort( $importers, '_usort_by_first_member' );

</span><span class="cx" style="display: block; padding: 0 10px">        ?>

</span></span></pre></div>

<a id="trunksrcwpadminincludesadminfiltersphp"></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/admin-filters.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/admin-filters.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/admin-filters.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,7 +128,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'upgrader_process_complete', 'wp_update_plugins', 10, 0 );

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'upgrader_process_complete', 'wp_update_themes', 10, 0 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Privacy hooks

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Privacy hooks.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_privacy_personal_data_erasure_page', 'wp_privacy_process_personal_data_erasure_page', 10, 5 );

</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_privacy_personal_data_export_page', 'wp_privacy_process_personal_data_export_page', 10, 7 );

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_privacy_personal_data_export_file', 'wp_privacy_generate_personal_data_export_file', 10 );

</span></span></pre></div>

<a id="trunksrcwpadminincludesadminphp"></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/admin.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/admin.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/admin.php       2020-01-29 00:43:23 UTC (rev 47122)

</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"> require_once( ABSPATH . 'wp-admin/includes/privacy-tools.php' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> /** WordPress Privacy List Table classes. */

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Previously in wp-admin/includes/user.php. Need to be loaded for backwards compatibility.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Previously in wp-admin/includes/user.php. Need to be loaded for backward compatibility.

</ins><span class="cx" style="display: block; padding: 0 10px"> require_once( ABSPATH . 'wp-admin/includes/class-wp-privacy-requests-table.php' );

</span><span class="cx" style="display: block; padding: 0 10px"> require_once( ABSPATH . 'wp-admin/includes/class-wp-privacy-data-export-requests-list-table.php' );

</span><span class="cx" style="display: block; padding: 0 10px"> require_once( ABSPATH . 'wp-admin/includes/class-wp-privacy-data-removal-requests-list-table.php' );

</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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/ajax-actions.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,7 +22,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> function wp_ajax_nopriv_heartbeat() {

</span><span class="cx" style="display: block; padding: 0 10px">        $response = array();

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // screen_id is the same as $current_screen->id and the JS global 'pagenow'.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // 'screen_id' is the same as $current_screen->id and the JS global 'pagenow'.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! empty( $_POST['screen_id'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $screen_id = sanitize_key( $_POST['screen_id'] );

</span><span class="cx" style="display: block; padding: 0 10px">        } else {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -272,8 +272,8 @@

</span><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"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Check the type of request

-       // Current allowed values are `add` and `search`

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Check the type of request.

+       // Current allowed values are `add` and `search`.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( isset( $_REQUEST['autocomplete_type'] ) && 'search' === $_REQUEST['autocomplete_type'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $type = $_REQUEST['autocomplete_type'];

</span><span class="cx" style="display: block; padding: 0 10px">        } else {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -280,8 +280,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $type = 'add';

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Check the desired field for value

-       // Current allowed values are `user_email` and `user_login`

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Check the desired field for value.

+       // Current allowed values are `user_email` and `user_login`.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( isset( $_REQUEST['autocomplete_field'] ) && 'user_email' === $_REQUEST['autocomplete_field'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $field = $_REQUEST['autocomplete_field'];

</span><span class="cx" style="display: block; padding: 0 10px">        } else {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -288,7 +288,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $field = 'user_login';

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Exclude current users of this blog

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Exclude current users of this blog.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( isset( $_REQUEST['site_id'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $id = absint( $_REQUEST['site_id'] );

</span><span class="cx" style="display: block; padding: 0 10px">        } else {

</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">        $page     = isset( $_POST['_page'] ) ? (int) $_POST['_page'] : 0;

</span><span class="cx" style="display: block; padding: 0 10px">        $url      = isset( $_POST['_url'] ) ? esc_url_raw( $_POST['_url'] ) : '';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // JS didn't send us everything we need to know. Just die with success message

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // JS didn't send us everything we need to know. Just die with success message.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! $total || ! $per_page || ! $page || ! $url ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $time           = time();

</span><span class="cx" style="display: block; padding: 0 10px">                $comment        = get_comment( $comment_id );

</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">                $total = 0;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Only do the expensive stuff on a page-break, and about 1 other time per page

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Only do the expensive stuff on a page-break, and about 1 other time per page.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( 0 == $total % $per_page || 1 == mt_rand( 1, $per_page ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $post_id = 0;

<span class="cx" style="display: block; padding: 0 10px">                // What type of comment count are we looking for?

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -600,7 +600,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $checked_categories[] = $cat_id;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( $parent ) { // Do these all at once in a second

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( $parent ) { // Do these all at once in a second.

</ins><span class="cx" style="display: block; padding: 0 10px">                         continue;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -626,11 +626,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        if ( $parent ) { // Foncy - replace the parent and all its children

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $parent ) { // Foncy - replace the parent and all its children.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $parent  = get_term( $parent, $taxonomy->name );

</span><span class="cx" style="display: block; padding: 0 10px">                $term_id = $parent->term_id;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                while ( $parent->parent ) { // get the top parent

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         while ( $parent->parent ) { // Get the top parent.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $parent = get_term( $parent->parent, $taxonomy->name );

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( is_wp_error( $parent ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                break;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -716,7 +716,8 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $r = wp_untrash_comment( $comment );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( ! isset( $_POST['comment_status'] ) || $_POST['comment_status'] != 'trash' ) { // undo trash, not in trash

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Undo trash, not in trash.

+               if ( ! isset( $_POST['comment_status'] ) || $_POST['comment_status'] != 'trash' ) {

</ins><span class="cx" style="display: block; padding: 0 10px">                         $delta = 1;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        } elseif ( isset( $_POST['spam'] ) && 1 == $_POST['spam'] ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -732,7 +733,8 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $r = wp_unspam_comment( $comment );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( ! isset( $_POST['comment_status'] ) || $_POST['comment_status'] != 'spam' ) { // undo spam, not in spam

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Undo spam, not in spam.

+               if ( ! isset( $_POST['comment_status'] ) || $_POST['comment_status'] != 'spam' ) {

</ins><span class="cx" style="display: block; padding: 0 10px">                         $delta = 1;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        } elseif ( isset( $_POST['delete'] ) && 1 == $_POST['delete'] ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -741,7 +743,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                wp_die( -1 );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        if ( $r ) { // Decide if we need to send back '1' or a more complicated response including page links and comment counts

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $r ) {

+               // Decide if we need to send back '1' or a more complicated response including page links and comment counts.

</ins><span class="cx" style="display: block; padding: 0 10px">                 _wp_ajax_delete_comment_response( $comment->comment_ID, $delta );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -989,7 +992,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $x->send();

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Decide if we need to send back '1' or a more complicated response including page links and comment counts

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Decide if we need to send back '1' or a more complicated response including page links and comment counts.

</ins><span class="cx" style="display: block; padding: 0 10px">         _wp_ajax_delete_comment_response( $comment->comment_ID );

</span><span class="cx" style="display: block; padding: 0 10px">        wp_die( 0 );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1161,7 +1164,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $tags[ $key ]->id   = $tag->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">-        // We need raw tag names here, so don't filter the output

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // We need raw tag names here, so don't filter the output.

</ins><span class="cx" style="display: block; padding: 0 10px">         $return = wp_generate_tag_cloud(

</span><span class="cx" style="display: block; padding: 0 10px">                $tags,

</span><span class="cx" style="display: block; padding: 0 10px">                array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1288,8 +1291,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 ( wp_create_nonce( 'unfiltered-html-comment' ) != $_POST['_wp_unfiltered_html_comment'] ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                kses_remove_filters(); // start with a clean slate

-                               kses_init_filters(); // set up the filters

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         kses_remove_filters(); // Start with a clean slate.

+                               kses_init_filters();   // Set up the filters.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 remove_filter( 'pre_comment_content', 'wp_filter_post_kses' );

</span><span class="cx" style="display: block; padding: 0 10px">                                add_filter( 'pre_comment_content', 'wp_filter_kses' );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1478,7 +1481,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $_menu_items = array_map( 'wp_setup_nav_menu_item', array( $_object ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $_menu_item  = reset( $_menu_items );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Restore the missing menu item properties

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Restore the missing menu item properties.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $menu_item_data['menu-item-description'] = $_menu_item->description;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1498,7 +1501,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! empty( $menu_obj->ID ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $menu_obj        = wp_setup_nav_menu_item( $menu_obj );

</span><span class="cx" style="display: block; padding: 0 10px">                        $menu_obj->title = empty( $menu_obj->title ) ? __( 'Menu Item' ) : $menu_obj->title;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $menu_obj->label = $menu_obj->title; // don't show "(pending)" in ajax-added items

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $menu_obj->label = $menu_obj->title; // Don't show "(pending)" in ajax-added items.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $menu_items[]    = $menu_obj;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1548,7 +1551,7 @@

<span class="cx" style="display: block; padding: 0 10px">                // If the post is an autodraft, save the post as a draft and then attempt to save the meta.

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $post->post_status == 'auto-draft' ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $post_data                = array();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $post_data['action']      = 'draft'; // Warning fix

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $post_data['action']      = 'draft'; // Warning fix.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $post_data['post_ID']     = $pid;

</span><span class="cx" style="display: block; padding: 0 10px">                        $post_data['post_type']   = $post->post_type;

</span><span class="cx" style="display: block; padding: 0 10px">                        $post_data['post_status'] = 'draft';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1608,7 +1611,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $meta = get_metadata_by_mid( 'post', $mid );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! $meta ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        wp_die( 0 ); // if meta doesn't exist

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 wp_die( 0 ); // If meta doesn't exist.

</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 (

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1731,7 +1734,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 ( is_array( $hidden ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $hidden = array_diff( $hidden, array( 'submitdiv', 'linksubmitdiv', 'manage-menu', 'create-menu' ) ); // postboxes that are always shown

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Postboxes that are always shown.

+               $hidden = array_diff( $hidden, array( 'submitdiv', 'linksubmitdiv', 'manage-menu', 'create-menu' ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 update_user_option( $user->ID, "metaboxhidden_$page", $hidden, 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">@@ -2620,7 +2624,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_set_post_thumbnail() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $json = ! empty( $_REQUEST['json'] ); // New-style request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $json = ! empty( $_REQUEST['json'] ); // New-style request.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $post_ID = intval( $_POST['post_id'] );

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! current_user_can( 'edit_post', $post_ID ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3226,7 +3230,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $html = stripslashes_deep( $_POST['html'] );

</span><span class="cx" style="display: block; padding: 0 10px">        } else {

</span><span class="cx" style="display: block; padding: 0 10px">                $html = isset( $attachment['post_title'] ) ? $attachment['post_title'] : '';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $rel  = $rel ? ' rel="attachment wp-att-' . $id . '"' : ''; // Hard-coded string, $id is already sanitized

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $rel  = $rel ? ' rel="attachment wp-att-' . $id . '"' : ''; // Hard-coded string, $id is already sanitized.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! empty( $url ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $html = '<a href="' . esc_url( $url ) . '"' . $rel . '>' . $html . '</a>';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3287,7 +3291,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $fallback = $wp_embed->maybe_make_link( $src );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( $check_embed !== $fallback ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // TinyMCE view for [embed] will parse this

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // TinyMCE view for [embed] will parse this.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $html = '[embed]' . $src . '[/embed]';

</span><span class="cx" style="display: block; padding: 0 10px">        } elseif ( $link_text ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $html = '<a href="' . esc_url( $src ) . '">' . $link_text . '</a>';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3327,7 +3331,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $data        = array();

</span><span class="cx" style="display: block; padding: 0 10px">        $nonce_state = wp_verify_nonce( $_POST['_nonce'], 'heartbeat-nonce' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // screen_id is the same as $current_screen->id and the JS global 'pagenow'.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // 'screen_id' is the same as $current_screen->id and the JS global 'pagenow'.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! empty( $_POST['screen_id'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $screen_id = sanitize_key( $_POST['screen_id'] );

</span><span class="cx" style="display: block; padding: 0 10px">        } else {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3392,7 +3396,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        do_action( 'heartbeat_tick', $response, $screen_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">-        // Send the current time according to the server

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Send the current time according to the server.

</ins><span class="cx" style="display: block; padding: 0 10px">         $response['server_time'] = time();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        wp_send_json( $response );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3735,7 +3739,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $post = get_post( (int) $_POST['post_ID'] );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // the embed shortcode requires a post

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // The embed shortcode requires a post.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! $post || ! current_user_can( 'edit_post', $post->ID ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( 'embed' === $shortcode ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        wp_send_json_error();

</span></span></pre></div>

<a id="trunksrcwpadminincludesclassautomaticupgraderskinphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-automatic-upgrader-skin.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-automatic-upgrader-skin.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/class-automatic-upgrader-skin.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,8 +41,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $context ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->options['context'] = $context;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // TODO: fix up request_filesystem_credentials(), or split it, to allow us to request a no-output version

-               // This will output a credentials form in event of failure, We don't want that, so just hide with a buffer

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /*

+                * TODO: Fix up request_filesystem_credentials(), or split it, to allow us to request a no-output version.

+                * This will output a credentials form in event of failure. We don't want that, so just hide with a buffer.

+                */

</ins><span class="cx" style="display: block; padding: 0 10px">                 ob_start();

</span><span class="cx" style="display: block; padding: 0 10px">                $result = parent::request_filesystem_credentials( $error, $context, $allow_relaxed_file_ownership );

</span><span class="cx" style="display: block; padding: 0 10px">                ob_end_clean();

</span></span></pre></div>

<a id="trunksrcwpadminincludesclasscoreupgraderphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-core-upgrader.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-core-upgrader.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/class-core-upgrader.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,7 +115,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $to_download = 'full';

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Lock to prevent multiple Core Updates occurring

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Lock to prevent multiple Core Updates occurring.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $lock = WP_Upgrader::create_lock( 'core_updater', 15 * MINUTE_IN_SECONDS );

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! $lock ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return new WP_Error( 'locked', $this->strings['locked'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -220,7 +220,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Clear the current updates

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Clear the current updates.

</ins><span class="cx" style="display: block; padding: 0 10px">                 delete_site_transient( 'update_core' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! $parsed_args['do_rollback'] ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -272,8 +272,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public static function should_update_to_version( $offered_ver ) {

</span><span class="cx" style="display: block; padding: 0 10px">                include( ABSPATH . WPINC . '/version.php' ); // $wp_version; // x.y.z

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $current_branch                 = implode( '.', array_slice( preg_split( '/[.-]/', $wp_version ), 0, 2 ) ); // x.y

-               $new_branch                     = implode( '.', array_slice( preg_split( '/[.-]/', $offered_ver ), 0, 2 ) ); // x.y

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $current_branch = implode( '.', array_slice( preg_split( '/[.-]/', $wp_version ), 0, 2 ) ); // x.y

+               $new_branch     = implode( '.', array_slice( preg_split( '/[.-]/', $offered_ver ), 0, 2 ) ); // x.y

+

</ins><span class="cx" style="display: block; padding: 0 10px">                 $current_is_development_version = (bool) strpos( $wp_version, '-' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                // Defaults:

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -284,17 +285,17 @@

</span><span class="cx" style="display: block; padding: 0 10px">                // WP_AUTO_UPDATE_CORE = true (all), 'minor', false.

</span><span class="cx" style="display: block; padding: 0 10px">                if ( defined( 'WP_AUTO_UPDATE_CORE' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( false === WP_AUTO_UPDATE_CORE ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Defaults to turned off, unless a filter allows it

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Defaults to turned off, unless a filter allows it.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $upgrade_dev   = false;

</span><span class="cx" style="display: block; padding: 0 10px">                                $upgrade_minor = false;

</span><span class="cx" style="display: block; padding: 0 10px">                                $upgrade_major = false;

</span><span class="cx" style="display: block; padding: 0 10px">                        } elseif ( true === WP_AUTO_UPDATE_CORE ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // ALL updates for core

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // ALL updates for core.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $upgrade_dev   = true;

</span><span class="cx" style="display: block; padding: 0 10px">                                $upgrade_minor = true;

</span><span class="cx" style="display: block; padding: 0 10px">                                $upgrade_major = true;

</span><span class="cx" style="display: block; padding: 0 10px">                        } elseif ( 'minor' === WP_AUTO_UPDATE_CORE ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Only minor updates for core

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Only minor updates for core.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $upgrade_dev   = false;

</span><span class="cx" style="display: block; padding: 0 10px">                                $upgrade_minor = true;

</span><span class="cx" style="display: block; padding: 0 10px">                                $upgrade_major = false;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -306,7 +307,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">-                // 2: If we're running a newer version, that's a nope

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // 2: If we're running a newer version, that's a nope.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( version_compare( $wp_version, $offered_ver, '>' ) ) {

</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">@@ -323,15 +324,17 @@

</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"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Cannot update if we're retrying the same A to B update that caused a non-critical failure.

-                       // Some non-critical failures do allow retries, like download_failed.

-                       // 3.7.1 => 3.7.2 resulted in files_not_writable, if we are still on 3.7.1 and still trying to update to 3.7.2.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 /*

+                        * Cannot update if we're retrying the same A to B update that caused a non-critical failure.

+                        * Some non-critical failures do allow retries, like download_failed.

+                        * 3.7.1 => 3.7.2 resulted in files_not_writable, if we are still on 3.7.1 and still trying to update to 3.7.2.

+                        */

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( empty( $failure_data['retry'] ) && $wp_version == $failure_data['current'] && $offered_ver == $failure_data['attempted'] ) {

</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><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // 3: 3.7-alpha-25000 -> 3.7-alpha-25678 -> 3.7-beta1 -> 3.7-beta2

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // 3: 3.7-alpha-25000 -> 3.7-alpha-25678 -> 3.7-beta1 -> 3.7-beta2.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $current_is_development_version ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -348,7 +351,7 @@

<span class="cx" style="display: block; padding: 0 10px">                        // Else fall through to minor + major branches below.

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // 4: Minor In-branch updates (3.7.0 -> 3.7.1 -> 3.7.2 -> 3.7.4)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // 4: Minor in-branch updates (3.7.0 -> 3.7.1 -> 3.7.2 -> 3.7.4).

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $current_branch == $new_branch ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -361,7 +364,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        return apply_filters( 'allow_minor_auto_core_updates', $upgrade_minor );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // 5: Major version updates (3.7.0 -> 3.8.0 -> 3.9.1)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // 5: Major version updates (3.7.0 -> 3.8.0 -> 3.9.1).

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( version_compare( $new_branch, $current_branch, '>' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -374,7 +377,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        return apply_filters( 'allow_major_auto_core_updates', $upgrade_major );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If we're not sure, we don't want it

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If we're not sure, we don't want it.

</ins><span class="cx" style="display: block; padding: 0 10px">                 return false;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -398,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">                foreach ( $checksums as $file => $checksum ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Skip files which get updated

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Skip files which get updated.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( 'wp-content' == substr( $file, 0, 10 ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                continue;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span></span></pre></div>

<a id="trunksrcwpadminincludesclasscustombackgroundphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-custom-background.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-custom-background.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/class-custom-background.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,7 +124,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( isset( $_POST['remove-background'] ) ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // @TODO: Uploaded files are not removed here.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // @todo Uploaded files are not removed here.

</ins><span class="cx" style="display: block; padding: 0 10px">                         check_admin_referer( 'custom-background-remove', '_wpnonce-custom-background-remove' );

</span><span class="cx" style="display: block; padding: 0 10px">                        set_theme_mod( 'background_image', '' );

</span><span class="cx" style="display: block; padding: 0 10px">                        set_theme_mod( 'background_image_thumb', '' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -284,7 +284,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                . " background-attachment: $background_attachment;";

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                        ?>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        <div id="custom-background-image" style="<?php echo $background_styles; ?>"><?php // must be double quote, see above ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div id="custom-background-image" style="<?php echo $background_styles; ?>"><?php // Must be double quote, see above. ?>

</ins><span class="cx" style="display: block; padding: 0 10px">                         <?php if ( $background_image_thumb ) { ?>

</span><span class="cx" style="display: block; padding: 0 10px">                <img class="custom-background-image" src="<?php echo $background_image_thumb; ?>" style="visibility:hidden;" alt="" /><br />

</span><span class="cx" style="display: block; padding: 0 10px">                <img class="custom-background-image" src="<?php echo $background_image_thumb; ?>" style="visibility:hidden;" alt="" />

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -503,7 +503,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $file     = $file['file'];

</span><span class="cx" style="display: block; padding: 0 10px">                $filename = wp_basename( $file );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Construct the object array

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Construct the object array.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $object = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'post_title'     => $filename,

</span><span class="cx" style="display: block; padding: 0 10px">                        'post_content'   => $url,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -512,10 +512,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'context'        => 'custom-background',

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Save the data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Save the data.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $id = wp_insert_attachment( $object, $file );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Add the meta-data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Add the metadata.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) );

</span><span class="cx" style="display: block; padding: 0 10px">                update_post_meta( $id, '_wp_attachment_is_custom_background', get_option( 'stylesheet' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -525,7 +525,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                set_theme_mod( 'background_image_thumb', esc_url_raw( $thumbnail[0] ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                /** This action is documented in wp-admin/includes/class-custom-image-header.php */

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                do_action( 'wp_create_file_in_uploads', $file, $id ); // For replication

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         do_action( 'wp_create_file_in_uploads', $file, $id ); // For replication.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->updated = 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="trunksrcwpadminincludesclasscustomimageheaderphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-custom-image-header.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-custom-image-header.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/class-custom-image-header.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -800,7 +800,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $max_width = 0;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // For flex, limit size of image displayed to 1500px unless theme says otherwise

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // For flex, limit size of image displayed to 1500px unless theme says otherwise.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( current_theme_supports( 'custom-header', 'flex-width' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $max_width = 1500;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -810,10 +810,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">                $max_width = max( $max_width, get_theme_support( 'custom-header', 'width' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If flexible height isn't supported and the image is the exact right size

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If flexible height isn't supported and the image is the exact right size.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! current_theme_supports( 'custom-header', 'flex-height' ) && ! current_theme_supports( 'custom-header', 'flex-width' )

</span><span class="cx" style="display: block; padding: 0 10px">                        && $width == get_theme_support( 'custom-header', 'width' ) && $height == get_theme_support( 'custom-header', 'height' ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Add the meta-data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Add the metadata.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( file_exists( $file ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                wp_update_attachment_metadata( $attachment_id, wp_generate_attachment_metadata( $attachment_id, $file ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -828,7 +828,7 @@

<span class="cx" style="display: block; padding: 0 10px">                         * @param string $file          Path to the file.

<span class="cx" style="display: block; padding: 0 10px">                         * @param int    $attachment_id Attachment ID.

</span><span class="cx" style="display: block; padding: 0 10px">                         */

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        do_action( 'wp_create_file_in_uploads', $file, $attachment_id ); // For replication

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 do_action( 'wp_create_file_in_uploads', $file, $attachment_id ); // For replication.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        return $this->finished();

</span><span class="cx" style="display: block; padding: 0 10px">                } elseif ( $width > $max_width ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -839,7 +839,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        /** This filter is documented in wp-admin/includes/class-custom-image-header.php */

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $image = apply_filters( 'wp_create_file_in_uploads', $image, $attachment_id ); // For replication

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $image = apply_filters( 'wp_create_file_in_uploads', $image, $attachment_id ); // For replication.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $url    = str_replace( wp_basename( $url ), wp_basename( $image ), $url );

</span><span class="cx" style="display: block; padding: 0 10px">                        $width  = $width / $oitar;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -910,7 +910,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $file     = $file['file'];

</span><span class="cx" style="display: block; padding: 0 10px">                $filename = wp_basename( $file );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Construct the object array

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Construct the object array.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $object = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'post_title'     => $filename,

</span><span class="cx" style="display: block; padding: 0 10px">                        'post_content'   => $url,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -919,7 +919,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'context'        => 'custom-header',

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Save the data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Save the data.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $attachment_id = wp_insert_attachment( $object, $file );

</span><span class="cx" style="display: block; padding: 0 10px">                return compact( 'attachment_id', 'file', 'filename', 'url', 'type' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -982,7 +982,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</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-admin/includes/class-custom-image-header.php */

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $cropped = apply_filters( 'wp_create_file_in_uploads', $cropped, $attachment_id ); // For replication

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $cropped = apply_filters( 'wp_create_file_in_uploads', $cropped, $attachment_id ); // For replication.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $object = $this->create_attachment_object( $cropped, $attachment_id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -990,7 +990,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        unset( $object['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">-                // Update the attachment

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Update the attachment.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $attachment_id = $this->insert_attachment( $object, $cropped );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $url = wp_get_attachment_url( $attachment_id );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1180,7 +1180,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'dst_width'  => null,

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // For flex, limit size of image displayed to 1500px unless theme says otherwise

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // For flex, limit size of image displayed to 1500px unless theme says otherwise.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $has_flex_width ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $max_width = 1500;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1318,7 +1318,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</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-admin/includes/class-custom-image-header.php */

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $cropped = apply_filters( 'wp_create_file_in_uploads', $cropped, $attachment_id ); // For replication

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $cropped = apply_filters( 'wp_create_file_in_uploads', $cropped, $attachment_id ); // For replication.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $object = $this->create_attachment_object( $cropped, $attachment_id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1434,8 +1434,8 @@

<span class="cx" style="display: block; padding: 0 10px">                // Get the default image if there is one.

</span><span class="cx" style="display: block; padding: 0 10px">                $default = get_theme_support( 'custom-header', 'default-image' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( ! $default ) { // If not,

-                       return $this->default_headers; // easy peasy.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( ! $default ) { // If not, easy peasy.

+                       return $this->default_headers;

</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">                $default             = sprintf( $default, get_template_directory_uri(), get_stylesheet_directory_uri() );

</span></span></pre></div>

<a id="trunksrcwpadminincludesclassfileuploadupgraderphp"></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-file-upload-upgrader.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-file-upload-upgrader.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/class-file-upload-upgrader.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,7 +56,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        wp_die( __( 'Please select a file' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //Handle a newly uploaded file, Else assume it's already been uploaded

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Handle a newly uploaded file. Else, assume it's already been uploaded.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! empty( $_FILES ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $overrides = array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'test_form' => false,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,7 +71,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->filename = $_FILES[ $form ]['name'];

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->package  = $file['file'];

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Construct the object array

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Construct the object array.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $object = array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_title'     => $this->filename,

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_content'   => $file['url'],

</span></span></pre></div>

<a id="trunksrcwpadminincludesclasslanguagepackupgraderphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-language-pack-upgrader.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-language-pack-upgrader.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/class-language-pack-upgrader.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -192,7 +192,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->skin->feedback( 'starting_upgrade' );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Remove any existing upgrade filters from the plugin/theme upgraders #WP29425 & #WP29230

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Remove any existing upgrade filters from the plugin/theme upgraders #WP29425 & #WP29230.

</ins><span class="cx" style="display: block; padding: 0 10px">                 remove_all_filters( 'upgrader_pre_install' );

</span><span class="cx" style="display: block; padding: 0 10px">                remove_all_filters( 'upgrader_clear_destination' );

</span><span class="cx" style="display: block; padding: 0 10px">                remove_all_filters( 'upgrader_post_install' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -202,7 +202,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->skin->header();

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Connect to the Filesystem first.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Connect to the filesystem first.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $res = $this->fs_connect( array( WP_CONTENT_DIR, WP_LANG_DIR ) );

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! $res ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->skin->footer();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -369,7 +369,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function get_name_for_update( $update ) {

</span><span class="cx" style="display: block; padding: 0 10px">                switch ( $update->type ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        case 'core':

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                return 'WordPress'; // Not translated

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         return 'WordPress'; // Not translated.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        case 'theme':

</span><span class="cx" style="display: block; padding: 0 10px">                                $theme = wp_get_theme( $update->slug );

</span></span></pre></div>

<a id="trunksrcwpadminincludesclasspluginupgraderphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-plugin-upgrader.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-plugin-upgrader.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/class-plugin-upgrader.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -123,7 +123,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        return $this->result;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Force refresh of plugin update information

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Force refresh of plugin update information.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_clean_plugins_cache( $parsed_args['clear_update_cache'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                return true;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -163,12 +163,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        return false;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Get the URL to the zip file

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Get the URL to the zip file.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $r = $current->response[ $plugin ];

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'upgrader_pre_install', array( $this, 'deactivate_plugin_before_upgrade' ), 10, 2 );

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'upgrader_clear_destination', array( $this, 'delete_old_plugin' ), 10, 4 );

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //'source_selection' => array($this, 'source_selection'), //there's a trac ticket to move up the directory for zip's which are made a bit differently, useful for non-.org plugins.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // There's a Trac ticket to move up the directory for zips which are made a bit differently, useful for non-.org plugins.

+               // 'source_selection' => array( $this, 'source_selection' ),

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $parsed_args['clear_update_cache'] ) {

<span class="cx" style="display: block; padding: 0 10px">                        // Clear cache so wp_update_plugins() knows about the new plugin.

</span><span class="cx" style="display: block; padding: 0 10px">                        add_action( 'upgrader_process_complete', 'wp_clean_plugins_cache', 9, 0 );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -197,7 +198,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        return $this->result;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Force refresh of plugin update information

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Force refresh of plugin update information.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_clean_plugins_cache( $parsed_args['clear_update_cache'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                return true;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -234,7 +235,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->skin->header();

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Connect to the Filesystem first.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Connect to the filesystem first.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $res = $this->fs_connect( array( WP_CONTENT_DIR, WP_PLUGIN_DIR ) );

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! $res ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->skin->footer();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -247,7 +248,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                 * Only start maintenance mode if:

</span><span class="cx" style="display: block; padding: 0 10px">                 * - running Multisite and there are one or more plugins specified, OR

<span class="cx" style="display: block; padding: 0 10px">                 * - a plugin with an update available is currently active.

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 * @TODO: For multisite, maintenance mode should only kick in for individual sites if at all possible.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+          * @todo For multisite, maintenance mode should only kick in for individual sites if at all possible.

</ins><span class="cx" style="display: block; padding: 0 10px">                  */

</span><span class="cx" style="display: block; padding: 0 10px">                $maintenance = ( is_multisite() && ! empty( $plugins ) );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $plugins as $plugin ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -294,11 +295,11 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $results[ $plugin ] = $this->result;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Prevent credentials auth screen from displaying multiple times

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Prevent credentials auth screen from displaying multiple times.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( false === $result ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                break;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                } //end foreach $plugins

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         } // End foreach $plugins.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->maintenance_mode( false );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -353,7 +354,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        return $source;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check the folder contains at least 1 valid plugin.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check that the folder contains at least 1 valid plugin.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $plugins_found = false;

</span><span class="cx" style="display: block; padding: 0 10px">                $files         = glob( $working_directory . '*.php' );

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $files ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -390,12 +391,14 @@

</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">-                $plugin = get_plugins( '/' . $this->result['destination_name'] ); //Ensure to pass with leading slash

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Ensure to pass with leading slash.

+               $plugin = get_plugins( '/' . $this->result['destination_name'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( empty( $plugin ) ) {

</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">-                $pluginfiles = array_keys( $plugin ); //Assume the requested plugin is the first in the list

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Assume the requested plugin is the first in the list.

+               $pluginfiles = array_keys( $plugin );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                return $this->result['destination_name'] . '/' . $pluginfiles[0];

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -414,11 +417,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function deactivate_plugin_before_upgrade( $return, $plugin ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( is_wp_error( $return ) ) { //Bypass.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( is_wp_error( $return ) ) { // Bypass.

</ins><span class="cx" style="display: block; padding: 0 10px">                         return $return;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // When in cron (background updates) don't deactivate the plugin, as we require a browser to reactivate it

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // When in cron (background updates) don't deactivate the plugin, as we require a browser to reactivate it.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( wp_doing_cron() ) {

</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -429,7 +432,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( is_plugin_active( $plugin ) ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        //Deactivate the plugin silently, Prevent deactivation hooks from running.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Deactivate the plugin silently, Prevent deactivation hooks from running.

</ins><span class="cx" style="display: block; padding: 0 10px">                         deactivate_plugins( $plugin, 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">@@ -456,7 +459,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                global $wp_filesystem;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( is_wp_error( $removed ) ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return $removed; //Pass errors through.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return $removed; // Pass errors through.

</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">                $plugin = isset( $plugin['plugin'] ) ? $plugin['plugin'] : '';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -467,12 +470,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $plugins_dir     = $wp_filesystem->wp_plugins_dir();

</span><span class="cx" style="display: block; padding: 0 10px">                $this_plugin_dir = trailingslashit( dirname( $plugins_dir . $plugin ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( ! $wp_filesystem->exists( $this_plugin_dir ) ) { //If it's already vanished.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( ! $wp_filesystem->exists( $this_plugin_dir ) ) { // If it's already vanished.

</ins><span class="cx" style="display: block; padding: 0 10px">                         return $removed;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // If plugin is in its own directory, recursively delete the directory.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( strpos( $plugin, '/' ) && $this_plugin_dir != $plugins_dir ) { //base check on if plugin includes directory separator AND that it's not the root plugin folder

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Base check on if plugin includes directory separator AND that it's not the root plugin folder.

+               if ( strpos( $plugin, '/' ) && $this_plugin_dir != $plugins_dir ) {

</ins><span class="cx" style="display: block; padding: 0 10px">                         $deleted = $wp_filesystem->delete( $this_plugin_dir, true );

</span><span class="cx" style="display: block; padding: 0 10px">                } else {

</span><span class="cx" style="display: block; padding: 0 10px">                        $deleted = $wp_filesystem->delete( $plugins_dir . $plugin );

</span></span></pre></div>

<a id="trunksrcwpadminincludesclassthemeupgraderphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-theme-upgrader.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-theme-upgrader.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/class-theme-upgrader.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,7 +94,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @return bool

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function check_parent_theme_filter( $install_result, $hook_extra, $child_result ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check to see if we need to install a parent theme

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check to see if we need to install a parent theme.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $theme_info = $this->theme_info();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! $theme_info->parent() ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -119,11 +119,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        'tags'     => false,

</span><span class="cx" style="display: block; padding: 0 10px">                                ),

</span><span class="cx" style="display: block; padding: 0 10px">                        )

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                ); //Save on a bit of bandwidth.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         ); // Save on a bit of bandwidth.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! $api || is_wp_error( $api ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->skin->feedback( 'parent_theme_not_found', $theme_info->get( 'Template' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Don't show activate or preview actions after installation

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Don't show activate or preview actions after installation.

</ins><span class="cx" style="display: block; padding: 0 10px">                         add_filter( 'install_theme_complete_actions', array( $this, 'hide_activate_preview_actions' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        return $install_result;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -132,20 +132,21 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $child_api             = $this->skin->api;

</span><span class="cx" style="display: block; padding: 0 10px">                $child_success_message = $this->strings['process_success'];

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Override them

-               $this->skin->api                           = $api;

-               $this->strings['process_success_specific'] = $this->strings['parent_theme_install_success'];//, $api->name, $api->version);

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Override them.

+               $this->skin->api = $api;

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                $this->strings['process_success_specific'] = $this->strings['parent_theme_install_success']; //, $api->name, $api->version );

+

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->skin->feedback( 'parent_theme_prepare_install', $api->name, $api->version );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                add_filter( 'install_theme_complete_actions', '__return_false', 999 ); // Don't show any actions after installing the theme.

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Install the parent theme

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Install the parent theme.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $parent_result = $this->run(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'package'           => $api->download_link,

</span><span class="cx" style="display: block; padding: 0 10px">                                'destination'       => get_theme_root(),

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                'clear_destination' => false, //Do not overwrite files.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         'clear_destination' => false, // Do not overwrite files.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'clear_working'     => 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">@@ -154,10 +155,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        add_filter( 'install_theme_complete_actions', array( $this, 'hide_activate_preview_actions' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Start cleaning up after the parents installation

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Start cleaning up after the parent's installation.

</ins><span class="cx" style="display: block; padding: 0 10px">                 remove_filter( 'install_theme_complete_actions', '__return_false', 999 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Reset child's result and data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Reset child's result and data.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->result                     = $child_result;

</span><span class="cx" style="display: block; padding: 0 10px">                $this->skin->api                  = $child_api;

</span><span class="cx" style="display: block; padding: 0 10px">                $this->strings['process_success'] = $child_success_message;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -219,7 +220,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'package'           => $package,

</span><span class="cx" style="display: block; padding: 0 10px">                                'destination'       => get_theme_root(),

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                'clear_destination' => false, //Do not overwrite files.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         'clear_destination' => false, // Do not overwrite files.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'clear_working'     => true,

</span><span class="cx" style="display: block; padding: 0 10px">                                'hook_extra'        => array(

</span><span class="cx" style="display: block; padding: 0 10px">                                        'type'   => 'theme',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -236,7 +237,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        return $this->result;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Refresh the Theme Update information

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Refresh the Theme Update information.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_clean_themes_cache( $parsed_args['clear_update_cache'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                return true;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -349,7 +350,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->skin->header();

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Connect to the Filesystem first.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Connect to the filesystem first.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $res = $this->fs_connect( array( WP_CONTENT_DIR ) );

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! $res ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->skin->footer();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -358,10 +359,12 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->skin->bulk_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">-                // Only start maintenance mode if:

-               // - running Multisite and there are one or more themes specified, OR

-               // - a theme with an update available is currently in use.

-               // @TODO: For multisite, maintenance mode should only kick in for individual sites if at all possible.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /*

+                * Only start maintenance mode if:

+                * - running Multisite and there are one or more themes specified, OR

+                * - a theme with an update available is currently in use.

+                * @todo For multisite, maintenance mode should only kick in for individual sites if at all possible.

+                */

</ins><span class="cx" style="display: block; padding: 0 10px">                 $maintenance = ( is_multisite() && ! empty( $themes ) );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $themes as $theme ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $maintenance = $maintenance || $theme == get_stylesheet() || $theme == get_template();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -388,7 +391,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                continue;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Get the URL to the zip file

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Get the URL to the zip file.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $r = $current->response[ $theme ];

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $result = $this->run(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -406,15 +409,15 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $results[ $theme ] = $this->result;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Prevent credentials auth screen from displaying multiple times

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Prevent credentials auth screen from displaying multiple times.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( false === $result ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                break;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                } //end foreach $plugins

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         } // End foreach $themes.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->maintenance_mode( 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">-                // Refresh the Theme Update information

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Refresh the Theme Update information.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_clean_themes_cache( $parsed_args['clear_update_cache'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                /** This action is documented in wp-admin/includes/class-wp-upgrader.php */

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -462,13 +465,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        return $source;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check the folder contains a valid theme

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check that the folder contains a valid theme.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $working_directory = str_replace( $wp_filesystem->wp_content_dir(), trailingslashit( WP_CONTENT_DIR ), $source );

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! is_dir( $working_directory ) ) { // Sanity check, if the above fails, let's not prevent installation.

</span><span class="cx" style="display: block; padding: 0 10px">                        return $source;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // A proper archive should have a style.css file in the single subdirectory

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // A proper archive should have a style.css file in the single subdirectory.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! file_exists( $working_directory . 'style.css' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return new WP_Error(

</span><span class="cx" style="display: block; padding: 0 10px">                                'incompatible_archive_theme_no_style',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -536,10 +539,11 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $theme = isset( $theme['theme'] ) ? $theme['theme'] : '';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( $theme != get_stylesheet() ) { //If not current

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( $theme != get_stylesheet() ) { // If not current.

</ins><span class="cx" style="display: block; padding: 0 10px">                         return $return;

</span><span class="cx" style="display: block; padding: 0 10px">                }

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //Change to maintenance mode now.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

+               // Change to maintenance mode now.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! $this->bulk ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->maintenance_mode( true );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -566,7 +570,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $theme = isset( $theme['theme'] ) ? $theme['theme'] : '';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( $theme != get_stylesheet() ) { // If not current

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( $theme != get_stylesheet() ) { // If not current.

</ins><span class="cx" style="display: block; padding: 0 10px">                         return $return;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -577,7 +581,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        switch_theme( $stylesheet );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //Time to remove maintenance mode

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Time to remove maintenance mode.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! $this->bulk ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->maintenance_mode( false );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span></span></pre></div>

<a id="trunksrcwpadminincludesclasswalkercategorychecklistphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-walker-category-checklist.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-walker-category-checklist.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/class-walker-category-checklist.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,7 +21,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public $db_fields = array(

</span><span class="cx" style="display: block; padding: 0 10px">                'parent' => 'parent',

</span><span class="cx" style="display: block; padding: 0 10px">                'id'     => 'term_id',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        ); //TODO: decouple this

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ); // TODO: Decouple this.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Starts the list before the elements are added.

</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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/class-walker-nav-menu-checklist.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,7 +106,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $output .= '</label>';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Menu item hidden fields

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Menu item hidden fields.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $output .= '<input type="hidden" class="menu-item-db-id" name="menu-item[' . $possible_object_id . '][menu-item-db-id]" value="' . $possible_db_id . '" />';

</span><span class="cx" style="display: block; padding: 0 10px">                $output .= '<input type="hidden" class="menu-item-object" name="menu-item[' . $possible_object_id . '][menu-item-object]" value="' . esc_attr( $item->object ) . '" />';

</span><span class="cx" style="display: block; padding: 0 10px">                $output .= '<input type="hidden" class="menu-item-parent-id" name="menu-item[' . $possible_object_id . '][menu-item-parent-id]" value="' . esc_attr( $item->menu_item_parent ) . '" />';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -119,4 +119,4 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $output .= '<input type="hidden" class="menu-item-xfn" name="menu-item[' . $possible_object_id . '][menu-item-xfn]" value="' . esc_attr( $item->xfn ) . '" />';

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-} // Walker_Nav_Menu_Checklist

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+}

</ins></span></pre></div>

<a id="trunksrcwpadminincludesclasswalkernavmenueditphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-walker-nav-menu-edit.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-walker-nav-menu-edit.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/class-walker-nav-menu-edit.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -295,4 +295,4 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $output .= ob_get_clean();

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-} // Walker_Nav_Menu_Edit

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+}

</ins></span></pre></div>

<a id="trunksrcwpadminincludesclasswpautomaticupdaterphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-automatic-updater.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-automatic-updater.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/class-wp-automatic-updater.php  2020-01-29 00:43:23 UTC (rev 47122)

</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">                        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">-                // Only relax the filesystem checks when the update doesn't include new files

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Only relax the filesystem checks when the update doesn't include new files.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $allow_relaxed_file_ownership = false;

</span><span class="cx" style="display: block; padding: 0 10px">                if ( 'core' == $type && isset( $item->new_files ) && ! $item->new_files ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $allow_relaxed_file_ownership = true;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -283,7 +283,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                break;

</span><span class="cx" style="display: block; padding: 0 10px">                        case 'plugin':

</span><span class="cx" style="display: block; padding: 0 10px">                                $upgrader = new Plugin_Upgrader( $skin );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $context  = WP_PLUGIN_DIR; // We don't support custom Plugin directories, or updates for WPMU_PLUGIN_DIR

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $context  = WP_PLUGIN_DIR; // We don't support custom Plugin directories, or updates for WPMU_PLUGIN_DIR.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 break;

</span><span class="cx" style="display: block; padding: 0 10px">                        case 'theme':

</span><span class="cx" style="display: block; padding: 0 10px">                                $upgrader = new Theme_Upgrader( $skin );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -357,7 +357,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'pre_check_md5'                => false,

<span class="cx" style="display: block; padding: 0 10px">                                // Only available for core updates.

</span><span class="cx" style="display: block; padding: 0 10px">                                'attempt_rollback'             => true,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Allow relaxed file ownership in some scenarios

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Allow relaxed file ownership in some scenarios.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'allow_relaxed_file_ownership' => $allow_relaxed_file_ownership,

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -409,36 +409,36 @@

</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">-                // Don't automatically run these thins, as we'll handle it ourselves

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Don't automatically run these things, as we'll handle it ourselves.

</ins><span class="cx" style="display: block; padding: 0 10px">                 remove_action( 'upgrader_process_complete', array( 'Language_Pack_Upgrader', 'async_upgrade' ), 20 );

</span><span class="cx" style="display: block; padding: 0 10px">                remove_action( 'upgrader_process_complete', 'wp_version_check' );

</span><span class="cx" style="display: block; padding: 0 10px">                remove_action( 'upgrader_process_complete', 'wp_update_plugins' );

</span><span class="cx" style="display: block; padding: 0 10px">                remove_action( 'upgrader_process_complete', 'wp_update_themes' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Next, Plugins

-               wp_update_plugins(); // Check for Plugin updates

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Next, plugins.

+               wp_update_plugins(); // Check for plugin updates.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $plugin_updates = get_site_transient( 'update_plugins' );

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $plugin_updates && ! empty( $plugin_updates->response ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        foreach ( $plugin_updates->response as $plugin ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->update( 'plugin', $plugin );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Force refresh of plugin update information

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Force refresh of plugin update information.

</ins><span class="cx" style="display: block; padding: 0 10px">                         wp_clean_plugins_cache();

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Next, those themes we all love

-               wp_update_themes();  // Check for Theme updates

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Next, those themes we all love.

+               wp_update_themes();  // Check for theme updates.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $theme_updates = get_site_transient( 'update_themes' );

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $theme_updates && ! empty( $theme_updates->response ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        foreach ( $theme_updates->response as $theme ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->update( 'theme', (object) $theme );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Force refresh of theme update information

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Force refresh of theme update information.

</ins><span class="cx" style="display: block; padding: 0 10px">                         wp_clean_themes_cache();

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Next, Process any core update

-               wp_version_check(); // Check for Core updates

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Next, process any core update.

+               wp_version_check(); // Check for core updates.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $core_update = find_core_auto_update();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $core_update ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -445,8 +445,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->update( 'core', $core_update );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Clean up, and check for any pending translations

-               // (Core_Upgrader checks for core updates)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Clean up, and check for any pending translations.

+               // (Core_Upgrader checks for core updates.)

</ins><span class="cx" style="display: block; padding: 0 10px">                 $theme_stats = array();

</span><span class="cx" style="display: block; padding: 0 10px">                if ( isset( $this->update_results['theme'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        foreach ( $this->update_results['theme'] as $upgrade ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -453,7 +453,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                $theme_stats[ $upgrade->item->theme ] = ( true === $upgrade->result );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                wp_update_themes( $theme_stats );  // Check for Theme updates

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         wp_update_themes( $theme_stats ); // Check for theme updates.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $plugin_stats = array();

</span><span class="cx" style="display: block; padding: 0 10px">                if ( isset( $this->update_results['plugin'] ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -461,9 +461,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                $plugin_stats[ $upgrade->item->plugin ] = ( true === $upgrade->result );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                wp_update_plugins( $plugin_stats ); // Check for Plugin updates

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         wp_update_plugins( $plugin_stats ); // Check for plugin updates.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Finally, Process any new translations

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Finally, process any new translations.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $language_updates = wp_get_translation_updates();

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $language_updates ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        foreach ( $language_updates as $update ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -470,12 +470,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->update( 'translation', $update );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Clear existing caches

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Clear existing caches.

</ins><span class="cx" style="display: block; padding: 0 10px">                         wp_clean_update_cache();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        wp_version_check();  // check for Core updates

-                       wp_update_themes();  // Check for Theme updates

-                       wp_update_plugins(); // Check for Plugin updates

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 wp_version_check();  // Check for core updates.

+                       wp_update_themes();  // Check for theme updates.

+                       wp_update_plugins(); // Check for plugin updates.

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Send debugging email to admin for all development installations.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -626,7 +626,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $next_user_core_update = get_preferred_from_update_core();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If the update transient is empty, use the update we just performed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If the update transient is empty, use the update we just performed.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! $next_user_core_update ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $next_user_core_update = $core_update;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -860,7 +860,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                /* translators: %s: Network home URL. */

</span><span class="cx" style="display: block; padding: 0 10px">                $body[] = sprintf( __( 'WordPress site: %s' ), network_home_url( '/' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Core

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Core.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( isset( $this->update_results['core'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $result = $this->update_results['core'][0];

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( $result->result && ! is_wp_error( $result->result ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -874,7 +874,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $body[] = '';

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Plugins, Themes, Translations

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Plugins, Themes, Translations.

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( array( 'plugin', 'theme', 'translation' ) as $type ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! isset( $this->update_results[ $type ] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                continue;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -894,7 +894,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 ( $success_items != $this->update_results[ $type ] ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Failed updates

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Failed updates.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $messages = array(

</span><span class="cx" style="display: block; padding: 0 10px">                                        'plugin'      => __( 'The following plugins failed to update:' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                        'theme'       => __( 'The following themes failed to update:' ),

</span></span></pre></div>

<a id="trunksrcwpadminincludesclasswpcommentslisttablephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-comments-list-table.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-comments-list-table.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/class-wp-comments-list-table.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,7 +100,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                if ( isset( $_REQUEST['number'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $number = (int) $_REQUEST['number'];

</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">-                        $number = $comments_per_page + min( 8, $comments_per_page ); // Grab a few extra

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $number = $comments_per_page + min( 8, $comments_per_page ); // Grab a few extra.

</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 = $this->get_pagenum();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -222,7 +222,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'All <span class="count">(%s)</span>',

</span><span class="cx" style="display: block; padding: 0 10px">                                'All <span class="count">(%s)</span>',

</span><span class="cx" style="display: block; padding: 0 10px">                                'comments'

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        ), // singular not used

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 ), // Singular not used.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        /* translators: %s: Number of comments. */

</span><span class="cx" style="display: block; padding: 0 10px">                        'mine'      => _nx_noop(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -746,7 +746,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        ++$i;

</span><span class="cx" style="display: block; padding: 0 10px">                        ( ( ( 'approve' === $action || 'unapprove' === $action ) && 2 === $i ) || 1 === $i ) ? $sep = '' : $sep = ' | ';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Reply and quickedit need a hide-if-no-js span when not added with ajax

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Reply and quickedit need a hide-if-no-js span when not added with ajax.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( ( 'reply' === $action || 'quickedit' === $action ) && ! wp_doing_ajax() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $action .= ' hide-if-no-js';

</span><span class="cx" style="display: block; padding: 0 10px">                        } elseif ( ( $action === 'untrash' && $the_comment_status === 'trash' ) || ( $action === 'unspam' && $the_comment_status === 'spam' ) ) {

</span></span></pre></div>

<a id="trunksrcwpadminincludesclasswpcommunityeventsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-community-events.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-community-events.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/class-wp-community-events.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -92,7 +92,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        return $cached_events;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // include an unmodified $wp_version

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Include an unmodified $wp_version.

</ins><span class="cx" style="display: block; padding: 0 10px">                 include( ABSPATH . WPINC . '/version.php' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $api_url                    = 'http://api.wordpress.org/events/1.0/';

</span></span></pre></div>

<a id="trunksrcwpadminincludesclasswpdebugdataphp"></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-debug-data.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-debug-data.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/class-wp-debug-data.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -580,7 +580,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( function_exists( 'phpversion' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $php_version_debug = phpversion();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Whether PHP supports 64bit

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Whether PHP supports 64-bit.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $php64bit = ( PHP_INT_SIZE * 8 === 64 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $php_version = sprintf(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -677,7 +677,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // SUHOSIN

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // SUHOSIN.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $suhosin_loaded = ( extension_loaded( 'suhosin' ) || ( defined( 'SUHOSIN_PATCH' ) && constant( 'SUHOSIN_PATCH' ) ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $info['wp-server']['fields']['suhosin'] = array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -686,7 +686,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'debug' => $suhosin_loaded,

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Imagick

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Imagick.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $imagick_loaded = extension_loaded( 'imagick' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $info['wp-server']['fields']['imagick_availability'] = array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1012,7 +1012,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $theme_version = $theme->version;

</span><span class="cx" style="display: block; padding: 0 10px">                        $theme_author  = $theme->author;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Sanitize

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Sanitize.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $theme_author = wp_kses( $theme_author, array() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $theme_version_string       = __( 'No version or author information is available.' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1054,7 +1054,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">-                // Add more filesystem checks

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Add more filesystem checks.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( defined( 'WPMU_PLUGIN_DIR' ) && is_dir( WPMU_PLUGIN_DIR ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $is_writable_wpmu_plugin_dir = wp_is_writable( WPMU_PLUGIN_DIR );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunksrcwpadminincludesclasswpfilesystembasephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-filesystem-base.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-filesystem-base.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/class-wp-filesystem-base.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -55,7 +55,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function abspath() {

</span><span class="cx" style="display: block; padding: 0 10px">                $folder = $this->find_folder( ABSPATH );

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Perhaps the FTP folder is rooted at the WordPress install, Check for wp-includes folder in root, Could have some false positives, but rare.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Perhaps the FTP folder is rooted at the WordPress install.

+               // Check for wp-includes folder in root. Could have some false positives, but rare.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! $folder && $this->is_dir( '/' . WPINC ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $folder = '/';

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,7 +97,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function wp_themes_dir( $theme = false ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $theme_root = get_theme_root( $theme );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Account for relative theme roots

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Account for relative theme roots.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( '/themes' == $theme_root || ! is_dir( $theme_root ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $theme_root = WP_CONTENT_DIR . $theme_root;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -182,7 +183,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'FTP_LANG_DIR'    => WP_LANG_DIR,

</span><span class="cx" style="display: block; padding: 0 10px">                        );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Direct matches ( folder = CONSTANT/ )

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Direct matches ( folder = CONSTANT/ ).

</ins><span class="cx" style="display: block; padding: 0 10px">                         foreach ( $constant_overrides as $constant => $dir ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( ! defined( $constant ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        continue;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -192,12 +193,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Prefix Matches ( folder = CONSTANT/subdir )

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Prefix matches ( folder = CONSTANT/subdir ),

</ins><span class="cx" style="display: block; padding: 0 10px">                         foreach ( $constant_overrides as $constant => $dir ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( ! defined( $constant ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        continue;

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                if ( 0 === stripos( $folder, $dir ) ) { // $folder starts with $dir

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         if ( 0 === stripos( $folder, $dir ) ) { // $folder starts with $dir.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         $potential_folder = preg_replace( '#^' . preg_quote( $dir, '#' ) . '/#i', trailingslashit( constant( $constant ) ), $folder );

</span><span class="cx" style="display: block; padding: 0 10px">                                        $potential_folder = trailingslashit( $potential_folder );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -208,12 +209,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                } elseif ( 'direct' == $this->method ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $folder = str_replace( '\\', '/', $folder ); // Windows path sanitisation

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $folder = str_replace( '\\', '/', $folder ); // Windows path sanitisation.

</ins><span class="cx" style="display: block; padding: 0 10px">                         return trailingslashit( $folder );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $folder = preg_replace( '|^([a-z]{1}):|i', '', $folder ); // Strip out windows drive letter if it's there.

-               $folder = str_replace( '\\', '/', $folder ); // Windows path sanitisation

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $folder = preg_replace( '|^([a-z]{1}):|i', '', $folder ); // Strip out Windows drive letter if it's there.

+               $folder = str_replace( '\\', '/', $folder ); // Windows path sanitisation.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( isset( $this->cache[ $folder ] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return $this->cache[ $folder ];

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -240,7 +241,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

<span class="cx" style="display: block; padding: 0 10px">         * @param string $folder The folder to locate.

<span class="cx" style="display: block; padding: 0 10px">         * @param string $base   The folder to start searching from.

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param bool   $loop   If the function has recursed, Internal use only.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param bool   $loop   If the function has recursed. Internal use only.

</ins><span class="cx" style="display: block; padding: 0 10px">          * @return string|false The location of the remote path, false to cease looping.

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function search_for_folder( $folder, $base = '.', $loop = false ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -303,7 +304,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Prevent this function from looping again.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // No need to proceed if we've just searched in /

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // No need to proceed if we've just searched in `/`.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $loop || '/' == $base ) {

</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">@@ -328,25 +329,25 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function gethchmod( $file ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $perms = intval( $this->getchmod( $file ), 8 );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( ( $perms & 0xC000 ) == 0xC000 ) { // Socket

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( ( $perms & 0xC000 ) == 0xC000 ) { // Socket.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $info = 's';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                } elseif ( ( $perms & 0xA000 ) == 0xA000 ) { // Symbolic Link

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         } elseif ( ( $perms & 0xA000 ) == 0xA000 ) { // Symbolic Link.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $info = 'l';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                } elseif ( ( $perms & 0x8000 ) == 0x8000 ) { // Regular

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         } elseif ( ( $perms & 0x8000 ) == 0x8000 ) { // Regular.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $info = '-';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                } elseif ( ( $perms & 0x6000 ) == 0x6000 ) { // Block special

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         } elseif ( ( $perms & 0x6000 ) == 0x6000 ) { // Block special.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $info = 'b';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                } elseif ( ( $perms & 0x4000 ) == 0x4000 ) { // Directory

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         } elseif ( ( $perms & 0x4000 ) == 0x4000 ) { // Directory.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $info = 'd';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                } elseif ( ( $perms & 0x2000 ) == 0x2000 ) { // Character special

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         } elseif ( ( $perms & 0x2000 ) == 0x2000 ) { // Character special.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $info = 'c';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                } elseif ( ( $perms & 0x1000 ) == 0x1000 ) { // FIFO pipe

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         } elseif ( ( $perms & 0x1000 ) == 0x1000 ) { // FIFO pipe.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $info = 'p';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                } else { // Unknown

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         } else { // Unknown.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $info = 'u';

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Owner

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Owner.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $info .= ( ( $perms & 0x0100 ) ? 'r' : '-' );

</span><span class="cx" style="display: block; padding: 0 10px">                $info .= ( ( $perms & 0x0080 ) ? 'w' : '-' );

</span><span class="cx" style="display: block; padding: 0 10px">                $info .= ( ( $perms & 0x0040 ) ?

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -353,7 +354,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        ( ( $perms & 0x0800 ) ? 's' : 'x' ) :

</span><span class="cx" style="display: block; padding: 0 10px">                                        ( ( $perms & 0x0800 ) ? 'S' : '-' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Group

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Group.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $info .= ( ( $perms & 0x0020 ) ? 'r' : '-' );

</span><span class="cx" style="display: block; padding: 0 10px">                $info .= ( ( $perms & 0x0010 ) ? 'w' : '-' );

</span><span class="cx" style="display: block; padding: 0 10px">                $info .= ( ( $perms & 0x0008 ) ?

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -360,7 +361,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        ( ( $perms & 0x0400 ) ? 's' : 'x' ) :

</span><span class="cx" style="display: block; padding: 0 10px">                                        ( ( $perms & 0x0400 ) ? 'S' : '-' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // World

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // World.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $info .= ( ( $perms & 0x0004 ) ? 'r' : '-' );

</span><span class="cx" style="display: block; padding: 0 10px">                $info .= ( ( $perms & 0x0002 ) ? 'w' : '-' );

</span><span class="cx" style="display: block; padding: 0 10px">                $info .= ( ( $perms & 0x0001 ) ?

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -827,4 +828,4 @@

</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">-} // WP_Filesystem_Base

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+}

</ins></span></pre></div>

<a id="trunksrcwpadminincludesclasswpfilesystemdirectphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-filesystem-direct.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-filesystem-direct.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/class-wp-filesystem-direct.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -131,7 +131,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! $this->is_dir( $file ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return chgrp( $file, $group );

</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 a directory, and we want recursive

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Is a directory, and we want recursive.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $file     = trailingslashit( $file );

</span><span class="cx" style="display: block; padding: 0 10px">                $filelist = $this->dirlist( $file );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $filelist as $filename ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -167,7 +167,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! $recursive || ! $this->is_dir( $file ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return chmod( $file, $mode );

</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 a directory, and we want recursive

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Is a directory, and we want recursive.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $file     = trailingslashit( $file );

</span><span class="cx" style="display: block; padding: 0 10px">                $filelist = $this->dirlist( $file );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( (array) $filelist as $filename => $filemeta ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -198,7 +198,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! $this->is_dir( $file ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return chown( $file, $owner );

</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 a directory, and we want recursive

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Is a directory, and we want recursive.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $filelist = $this->dirlist( $file );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $filelist as $filename ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->chown( $file . '/' . $filename, $owner, $recursive );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -327,10 +327,11 @@

<span class="cx" style="display: block; padding: 0 10px">         * @return bool True on success, false on failure.

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function delete( $file, $recursive = false, $type = false ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( empty( $file ) ) { // Some filesystems report this as /, which can cause non-expected recursive deletion of all files in the filesystem.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( empty( $file ) ) {

+                       // Some filesystems report this as /, which can cause non-expected recursive deletion of all files in the filesystem.

</ins><span class="cx" style="display: block; padding: 0 10px">                         return false;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $file = str_replace( '\\', '/', $file ); // for win32, occasional problems deleting files otherwise

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $file = str_replace( '\\', '/', $file ); // For Win32, occasional problems deleting files otherwise.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( 'f' == $type || $this->is_file( $file ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return @unlink( $file );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -339,7 +340,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        return @rmdir( $file );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // At this point it's a folder, and we're in recursive mode

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // At this point it's a folder, and we're in recursive mode.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $file     = trailingslashit( $file );

</span><span class="cx" style="display: block; padding: 0 10px">                $filelist = $this->dirlist( $file, true );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunksrcwpadminincludesclasswpfilesystemftpextphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-filesystem-ftpext.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-filesystem-ftpext.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/class-wp-filesystem-ftpext.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,8 +38,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"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // This Class uses the timeout on a per-connection basis, Others use it on a per-action basis.

-

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // This class uses the timeout on a per-connection basis, others use it on a per-action basis.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! defined( 'FS_TIMEOUT' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        define( 'FS_TIMEOUT', 240 );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -113,7 +112,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">-                // Set the Connection to use Passive FTP

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set the connection to use Passive FTP.

</ins><span class="cx" style="display: block; padding: 0 10px">                 ftp_pasv( $this->link, true );

</span><span class="cx" style="display: block; padding: 0 10px">                if ( @ftp_get_option( $this->link, FTP_TIMEOUT_SEC ) < FS_TIMEOUT ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        @ftp_set_option( $this->link, FTP_TIMEOUT_SEC, FS_TIMEOUT );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -146,7 +145,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">-                fseek( $temp, 0 ); // Skip back to the start of the file being written to

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         fseek( $temp, 0 ); // Skip back to the start of the file being written to.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $contents = '';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                while ( ! feof( $temp ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -203,7 +202,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">-                fseek( $temp, 0 ); // Skip back to the start of the file being written to

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         fseek( $temp, 0 ); // Skip back to the start of the file being written to.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $ret = ftp_fput( $this->link, $file, $temp, FTP_BINARY );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -273,7 +272,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">-                // chmod the file or directory

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // chmod the file or directory.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! function_exists( 'ftp_chmod' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return (bool) ftp_site( $this->link, sprintf( 'CHMOD %o %s', $mode, $file ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -405,7 +404,7 @@

<span class="cx" style="display: block; padding: 0 10px">                        return true; // File is an empty directory.

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return ! empty( $list ); //empty list = no file, so invert.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return ! empty( $list ); // Empty list = no file, so invert.

</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">@@ -573,7 +572,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( $lucifer[3] < 70 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $lucifer[3] += 2000;

</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">-                                $lucifer[3] += 1900; // 4digit year fix

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $lucifer[3] += 1900; // 4-digit year fix.

</ins><span class="cx" style="display: block; padding: 0 10px">                         }

</span><span class="cx" style="display: block; padding: 0 10px">                        $b['isdir'] = ( $lucifer[7] == '<DIR>' );

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( $b['isdir'] ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -593,7 +592,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                } elseif ( ! $is_windows ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $lucifer = preg_split( '/[ ]/', $line, 9, PREG_SPLIT_NO_EMPTY );

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( $lucifer ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                //echo $line."\n";

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // echo $line."\n";

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $lcount = count( $lucifer );

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( $lcount < 8 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        return '';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -637,7 +636,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">-                // Replace symlinks formatted as "source -> target" with just the source name

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Replace symlinks formatted as "source -> target" with just the source name.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( isset( $b['islink'] ) && $b['islink'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $b['name'] = preg_replace( '/(\s*->\s*.*)$/', '', $b['name'] );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span></span></pre></div>

<a id="trunksrcwpadminincludesclasswpfilesystemftpsocketsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-filesystem-ftpsockets.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-filesystem-ftpsockets.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/class-wp-filesystem-ftpsockets.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -150,12 +150,12 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        reset_mbstring_encoding();

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return ''; // Blank document, File does exist, It's just blank.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return ''; // Blank document. File does exist, it's just blank.

</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">                reset_mbstring_encoding();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                fseek( $temphandle, 0 ); // Skip back to the start of the file being written to

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         fseek( $temphandle, 0 ); // Skip back to the start of the file being written to.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $contents = '';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                while ( ! feof( $temphandle ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -198,7 +198,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">-                // The FTP class uses string functions internally during file download/upload

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // The FTP class uses string functions internally during file download/upload.

</ins><span class="cx" style="display: block; padding: 0 10px">                 mbstring_binary_safe_encoding();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $bytes_written = fwrite( $temphandle, $contents );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -211,7 +211,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        return 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">-                fseek( $temphandle, 0 ); // Skip back to the start of the file being written to

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         fseek( $temphandle, 0 ); // Skip back to the start of the file being written to.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $ret = $this->ftp->fput( $file, $temphandle );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -283,7 +283,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">-                // chmod the file or directory

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // chmod the file or directory.

</ins><span class="cx" style="display: block; padding: 0 10px">                 return $this->ftp->chmod( $file, $mode );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -408,7 +408,7 @@

<span class="cx" style="display: block; padding: 0 10px">                        return true; // File is an empty directory.

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return ! empty( $list ); //empty list = no file, so invert.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return ! empty( $list ); // Empty list = no file, so invert.

</ins><span class="cx" style="display: block; padding: 0 10px">                 // Return $this->ftp->is_exists($file); has issues with ABOR+426 responses on the ncFTPd server.

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -635,12 +635,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Replace symlinks formatted as "source -> target" with just the source name

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Replace symlinks formatted as "source -> target" with just the source name.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( $struc['islink'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $struc['name'] = preg_replace( '/(\s*->\s*.*)$/', '', $struc['name'] );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Add the Octal representation of the file permissions

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Add the octal representation of the file permissions.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $struc['permsn'] = $this->getnumchmodfromh( $struc['perms'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $ret[ $struc['name'] ] = $struc;

</span></span></pre></div>

<a id="trunksrcwpadminincludesclasswpfilesystemssh2php"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-filesystem-ssh2.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-filesystem-ssh2.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/class-wp-filesystem-ssh2.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -64,7 +64,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->method = 'ssh2';

</span><span class="cx" style="display: block; padding: 0 10px">                $this->errors = new WP_Error();

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //Check if possible to use ssh2 functions.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check if possible to use ssh2 functions.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! extension_loaded( 'ssh2' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->errors->add( 'no_ssh2_ext', __( 'The ssh2 PHP extension is not available' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        return;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -582,7 +582,7 @@

<span class="cx" style="display: block; padding: 0 10px">         * @return bool Whether $file is writable.

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function is_writable( $file ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // PHP will base it's writable checks on system_user === file_owner, not ssh_user === file_owner

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // PHP will base its writable checks on system_user === file_owner, not ssh_user === file_owner.

</ins><span class="cx" style="display: block; padding: 0 10px">                 return true;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -737,7 +737,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $struc['name'] = $entry;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( '.' == $struc['name'] || '..' == $struc['name'] ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                continue; //Do not care about these folders.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         continue; // Do not care about these folders.

</ins><span class="cx" style="display: block; padding: 0 10px">                         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! $include_hidden && '.' == $struc['name'][0] ) {

</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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/class-wp-importer.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,18 +25,18 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $limit  = 100;

</span><span class="cx" style="display: block; padding: 0 10px">                $offset = 0;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Grab all posts in chunks

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Grab all posts in chunks.

</ins><span class="cx" style="display: block; padding: 0 10px">                 do {

</span><span class="cx" style="display: block; padding: 0 10px">                        $meta_key = $importer_name . '_' . $bid . '_permalink';

</span><span class="cx" style="display: block; padding: 0 10px">                        $sql      = $wpdb->prepare( "SELECT post_id, meta_value FROM $wpdb->postmeta WHERE meta_key = %s LIMIT %d,%d", $meta_key, $offset, $limit );

</span><span class="cx" style="display: block; padding: 0 10px">                        $results  = $wpdb->get_results( $sql );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Increment offset

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Increment offset.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $offset = ( $limit + $offset );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Set permalinks into array

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Set permalinks into array.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         $hashtable[ $r->meta_value ] = intval( $r->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">@@ -62,7 +62,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $count = 0;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Get count of permalinks

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Get count of permalinks.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $meta_key = $importer_name . '_' . $bid . '_permalink';

</span><span class="cx" style="display: block; padding: 0 10px">                $sql      = $wpdb->prepare( "SELECT COUNT( post_id ) AS cnt FROM $wpdb->postmeta WHERE meta_key = %s", $meta_key );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,21 +94,21 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $limit  = 100;

</span><span class="cx" style="display: block; padding: 0 10px">                $offset = 0;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Grab all comments in chunks

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Grab all comments in chunks.

</ins><span class="cx" style="display: block; padding: 0 10px">                 do {

</span><span class="cx" style="display: block; padding: 0 10px">                        $sql     = $wpdb->prepare( "SELECT comment_ID, comment_agent FROM $wpdb->comments LIMIT %d,%d", $offset, $limit );

</span><span class="cx" style="display: block; padding: 0 10px">                        $results = $wpdb->get_results( $sql );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Increment offset

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Increment offset.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $offset = ( $limit + $offset );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Explode comment_agent key

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Explode comment_agent key.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         list ( $ca_bid, $source_comment_id ) = explode( '-', $r->comment_agent );

</span><span class="cx" style="display: block; padding: 0 10px">                                        $source_comment_id                   = intval( $source_comment_id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Check if this comment came from this blog

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Check if this comment came from this blog.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         if ( $bid == $ca_bid ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                $hashtable[ $source_comment_id ] = intval( $r->comment_ID );

</span><span class="cx" style="display: block; padding: 0 10px">                                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -203,7 +203,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @return array

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function get_page( $url, $username = '', $password = '', $head = false ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Increase the timeout

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Increase the timeout.

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_filter( 'http_request_timeout', array( $this, 'bump_request_timeout' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $headers = array();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -267,7 +267,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                global $wpdb, $wp_actions;

</span><span class="cx" style="display: block; padding: 0 10px">                // Or define( 'WP_IMPORTING', true );

</span><span class="cx" style="display: block; padding: 0 10px">                $wpdb->queries = array();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Reset $wp_actions to keep it from growing out of control

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Reset $wp_actions to keep it from growing out of control.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $wp_actions = array();

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -317,15 +317,15 @@

</span><span class="cx" style="display: 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">-        // Check array for specified param

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Check array for specified param.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( isset( $out[ $param ] ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set return value

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set return value.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $return = $out[ $param ];

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Check for missing required param

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Check for missing required param.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! isset( $out[ $param ] ) && $required ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Display message and exit

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Display message and exit.

</ins><span class="cx" style="display: block; padding: 0 10px">                 echo "\"$param\" parameter is required but was not specified\n";

</span><span class="cx" style="display: block; padding: 0 10px">                exit();

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span></span></pre></div>

<a id="trunksrcwpadminincludesclasswpinternalpointersphp"></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-internal-pointers.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-internal-pointers.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/class-wp-internal-pointers.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,10 +48,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                 *     )

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                $registered_pointers = array(

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        //None currently.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // None currently.

</ins><span class="cx" style="display: block; padding: 0 10px">                 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check if screen related pointer is registered

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check if screen related pointer is registered.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( empty( $registered_pointers[ $hook_suffix ] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,7 +75,7 @@

<span class="cx" style="display: block; padding: 0 10px">                        // None currently.

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Get dismissed pointers

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Get dismissed pointers.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $dismissed = explode( ',', (string) get_user_meta( get_current_user_id(), 'dismissed_wp_pointers', true ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $got_pointers = false;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -88,7 +88,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Bind pointer print function

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Bind pointer print function.

</ins><span class="cx" style="display: block; padding: 0 10px">                         add_action( 'admin_print_footer_scripts', array( 'WP_Internal_Pointers', 'pointer_' . $pointer ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $got_pointers = true;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -97,7 +97,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        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">-                // Add pointers script and style to queue

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Add pointers script and style to queue.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_enqueue_style( 'wp-pointer' );

</span><span class="cx" style="display: block; padding: 0 10px">                wp_enqueue_script( 'wp-pointer' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span></span></pre></div>

<a id="trunksrcwpadminincludesclasswplisttablephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-list-table.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-list-table.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/class-wp-list-table.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -451,7 +451,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                         *

<span class="cx" style="display: block; padding: 0 10px">                         * @param string[] $actions An array of the available bulk actions.

</span><span class="cx" style="display: block; padding: 0 10px">                         */

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->_actions = apply_filters( "bulk_actions-{$this->screen->id}", $this->_actions );  // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->_actions = apply_filters( "bulk_actions-{$this->screen->id}", $this->_actions ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores

</ins><span class="cx" style="display: block; padding: 0 10px">                         $two            = '';

</span><span class="cx" style="display: block; padding: 0 10px">                } else {

</span><span class="cx" style="display: block; padding: 0 10px">                        $two = '2';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1004,8 +1004,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $columns = get_column_headers( $this->screen );

</span><span class="cx" style="display: block; padding: 0 10px">                $default = $this->get_default_primary_column_name();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If the primary column doesn't exist fall back to the

-               // first non-checkbox column.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If the primary column doesn't exist,

+               // fall back to the first non-checkbox column.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! isset( $columns[ $default ] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $default = WP_List_Table::get_default_primary_column_name();

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1035,7 +1035,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @return array

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        protected function get_column_info() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // $_column_headers is already set / cached

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // $_column_headers is already set / cached.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( isset( $this->_column_headers ) && is_array( $this->_column_headers ) ) {

<span class="cx" style="display: block; padding: 0 10px">                        // Back-compat for list tables that have been manually setting $_column_headers for horse reasons.

<span class="cx" style="display: block; padding: 0 10px">                        // In 4.3, we added a fourth argument for primary column.

</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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -114,7 +114,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        preg_match( '/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.?$/', $s ) ||

</span><span class="cx" style="display: block; padding: 0 10px">                                        preg_match( '/^[0-9]{1,3}\.[0-9]{1,3}\.?$/', $s ) ||

</span><span class="cx" style="display: block; padding: 0 10px">                                        preg_match( '/^[0-9]{1,3}\.$/', $s ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // IPv4 address

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // IPv4 address.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $sql          = $wpdb->prepare( "SELECT blog_id FROM {$wpdb->registration_log} WHERE {$wpdb->registration_log}.IP LIKE %s", $wpdb->esc_like( $s ) . ( ! empty( $wild ) ? '%' : '' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $reg_blog_ids = $wpdb->get_col( $sql );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -133,7 +133,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $order_by = isset( $_REQUEST['orderby'] ) ? $_REQUEST['orderby'] : '';

</span><span class="cx" style="display: block; padding: 0 10px">                if ( 'registered' === $order_by ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // registered is a valid field name.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // 'registered' is a valid field name.

</ins><span class="cx" style="display: block; padding: 0 10px">                 } elseif ( 'lastupdated' === $order_by ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $order_by = 'last_updated';

</span><span class="cx" style="display: block; padding: 0 10px">                } elseif ( 'blogname' === $order_by ) {

</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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,7 +62,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @return array

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        protected function get_table_classes() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // todo: remove and add CSS for .themes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // @todo Remove and add CSS for .themes.

</ins><span class="cx" style="display: block; padding: 0 10px">                 return array( 'widefat', 'plugins' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunksrcwpadminincludesclasswpmsuserslisttablephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-ms-users-list-table.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-ms-users-list-table.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/class-wp-ms-users-list-table.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -93,7 +93,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                /** This filter is documented in wp-admin/includes/class-wp-users-list-table.php */

</span><span class="cx" style="display: block; padding: 0 10px">                $args = apply_filters( 'users_list_table_query_args', $args );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Query the user IDs for this page

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Query the user IDs for this page.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $wp_user_search = new WP_User_Query( $args );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->items = $wp_user_search->get_results();

</span></span></pre></div>

<a id="trunksrcwpadminincludesclasswpplugininstalllisttablephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -95,7 +95,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $per_page = 36;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // These are the tabs which are shown on the page

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // These are the tabs which are shown on the page.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $tabs = array();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( 'search' === $tab ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -471,7 +471,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                $plugin = (array) $plugin;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Display the group heading if there is one

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Display the group heading if there is one.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( isset( $plugin['group'] ) && $plugin['group'] != $group ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( isset( $this->groups[ $plugin['group'] ] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        $group_name = $this->groups[ $plugin['group'] ];

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -482,13 +482,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        $group_name = $plugin['group'];

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Starting a new group, close off the divs of the last one

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Starting a new group, close off the divs of the last one.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( ! empty( $group ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        echo '</div></div>';

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                echo '<div class="plugin-group"><h3>' . esc_html( $group_name ) . '</h3>';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // needs an extra wrapping div for nth-child selectors to work

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Needs an extra wrapping div for nth-child selectors to work.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 echo '<div class="plugin-items">';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                $group = $plugin['group'];

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -768,7 +768,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        <?php

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Close off the group divs of the last one

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Close off the group divs of the last one.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! empty( $group ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        echo '</div></div>';

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span></span></pre></div>

<a id="trunksrcwpadminincludesclasswppluginslisttablephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-plugins-list-table.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-plugins-list-table.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/class-wp-plugins-list-table.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -186,7 +186,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( isset( $plugin_info->response[ $plugin_file ] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $plugin_data                    = array_merge( (array) $plugin_info->response[ $plugin_file ], $plugin_data );

</span><span class="cx" style="display: block; padding: 0 10px">                                $plugins['all'][ $plugin_file ] = $plugin_data;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Make sure that $plugins['upgrade'] also receives the extra info since it is used on ?plugin_status=upgrade

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Make sure that $plugins['upgrade'] also receives the extra info since it is used on ?plugin_status=upgrade.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( isset( $plugins['upgrade'][ $plugin_file ] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        $plugins['upgrade'][ $plugin_file ] = $plugin_data;

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -193,33 +193,33 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        } elseif ( isset( $plugin_info->no_update[ $plugin_file ] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $plugin_data                    = array_merge( (array) $plugin_info->no_update[ $plugin_file ], $plugin_data );

</span><span class="cx" style="display: block; padding: 0 10px">                                $plugins['all'][ $plugin_file ] = $plugin_data;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Make sure that $plugins['upgrade'] also receives the extra info since it is used on ?plugin_status=upgrade

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Make sure that $plugins['upgrade'] also receives the extra info since it is used on ?plugin_status=upgrade.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( isset( $plugins['upgrade'][ $plugin_file ] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        $plugins['upgrade'][ $plugin_file ] = $plugin_data;

</span><span class="cx" style="display: 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">-                        // Filter into individual sections

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Filter into individual sections.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( is_multisite() && ! $screen->in_admin( 'network' ) && is_network_only_plugin( $plugin_file ) && ! is_plugin_active( $plugin_file ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( $show_network_active ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // On the non-network screen, show inactive network-only plugins if allowed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // On the non-network screen, show inactive network-only plugins if allowed.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         $plugins['inactive'][ $plugin_file ] = $plugin_data;

</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">-                                        // On the non-network screen, filter out network-only plugins as long as they're not individually active

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // On the non-network screen, filter out network-only plugins as long as they're not individually active.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         unset( $plugins['all'][ $plugin_file ] );

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px">                        } elseif ( ! $screen->in_admin( 'network' ) && is_plugin_active_for_network( $plugin_file ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( $show_network_active ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // On the non-network screen, show network-active plugins if allowed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // On the non-network screen, show network-active plugins if allowed.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         $plugins['active'][ $plugin_file ] = $plugin_data;

</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">-                                        // On the non-network screen, filter out network-active plugins

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // On the non-network screen, filter out network-active plugins.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         unset( $plugins['all'][ $plugin_file ] );

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px">                        } elseif ( ( ! $screen->in_admin( 'network' ) && is_plugin_active( $plugin_file ) )

</span><span class="cx" style="display: block; padding: 0 10px">                                || ( $screen->in_admin( 'network' ) && is_plugin_active_for_network( $plugin_file ) ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // On the non-network screen, populate the active list with plugins that are individually activated

-                               // On the network-admin screen, populate the active list with plugins that are network activated

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // On the non-network screen, populate the active list with plugins that are individually activated.

+                               // On the network admin screen, populate the active list with plugins that are network-activated.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $plugins['active'][ $plugin_file ] = $plugin_data;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( ! $screen->in_admin( 'network' ) && is_plugin_paused( $plugin_file ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -227,10 +227,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px">                        } else {

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( isset( $recently_activated[ $plugin_file ] ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Populate the recently activated list with plugins that have been recently activated

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Populate the recently activated list with plugins that have been recently activated.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         $plugins['recently_activated'][ $plugin_file ] = $plugin_data;

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Populate the inactive list with plugins that aren't activated

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Populate the inactive list with plugins that aren't activated.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $plugins['inactive'][ $plugin_file ] = $plugin_data;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -251,7 +251,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->items = array();

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $plugins[ $status ] as $plugin_file => $plugin_data ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Translate, Don't Apply Markup, Sanitize HTML

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Translate, don't apply markup, sanitize HTML.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->items[ $plugin_file ] = _get_plugin_data_markup_translate( $plugin_file, $plugin_data, false, 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">@@ -631,7 +631,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'delete'     => '',

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Do not restrict by default

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Do not restrict by default.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $restrict_network_active = false;

</span><span class="cx" style="display: block; padding: 0 10px">                $restrict_network_only   = false;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -643,10 +643,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( $plugin_file != $plugin_data['Name'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $plugin_name .= '<br/>' . $plugin_data['Name'];

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( true === ( $dropins[ $plugin_file ][1] ) ) { // Doesn't require a constant

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 if ( true === ( $dropins[ $plugin_file ][1] ) ) { // Doesn't require a constant.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $is_active   = true;

</span><span class="cx" style="display: block; padding: 0 10px">                                $description = '<p><strong>' . $dropins[ $plugin_file ][0] . '</strong></p>';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        } elseif ( defined( $dropins[ $plugin_file ][1] ) && constant( $dropins[ $plugin_file ][1] ) ) { // Constant is true

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 } elseif ( defined( $dropins[ $plugin_file ][1] ) && constant( $dropins[ $plugin_file ][1] ) ) { // Constant is true.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $is_active   = true;

</span><span class="cx" style="display: block; padding: 0 10px">                                $description = '<p><strong>' . $dropins[ $plugin_file ][0] . '</strong></p>';

</span><span class="cx" style="display: block; padding: 0 10px">                        } else {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -750,9 +750,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                                        __( 'Delete' )

</span><span class="cx" style="display: block; padding: 0 10px">                                                );

</span><span class="cx" style="display: block; padding: 0 10px">                                        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                } // end if $is_active

-                       } // end if $screen->in_admin( 'network' )

-               } // end if $context

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         } // End if $is_active.

+                       } // End if $screen->in_admin( 'network' ).

+               } // End if $context.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $actions = array_filter( $actions );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -906,7 +906,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                                $plugin_meta[] = sprintf( __( 'By %s' ), $author );

</span><span class="cx" style="display: block; padding: 0 10px">                                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Details link using API info, if available

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Details link using API info, if available.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         if ( isset( $plugin_data['slug'] ) && current_user_can( 'install_plugins' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                $plugin_meta[] = sprintf(

</span><span class="cx" style="display: block; padding: 0 10px">                                                        '<a href="%s" class="thickbox open-plugin-details-modal" aria-label="%s" data-title="%s">%s</a>',

</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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/class-wp-posts-list-table.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -143,7 +143,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function prepare_items() {

</span><span class="cx" style="display: block; padding: 0 10px">                global $avail_post_stati, $wp_query, $per_page, $mode;

</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 going to call wp()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Is going to call wp().

</ins><span class="cx" style="display: block; padding: 0 10px">                 $avail_post_stati = wp_edit_posts_query();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->set_hierarchical_display( is_post_type_hierarchical( $this->screen->post_type ) && 'menu_order title' === $wp_query->query['orderby'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -877,7 +877,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                $my_parents = array();

</span><span class="cx" style="display: block; padding: 0 10px">                                $my_parent  = $page->post_parent;

</span><span class="cx" style="display: block; padding: 0 10px">                                while ( $my_parent ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Get the ID from the list or the attribute if my_parent is an object

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Get the ID from the list or the attribute if my_parent is an object.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         $parent_id = $my_parent;

</span><span class="cx" style="display: block; padding: 0 10px">                                        if ( is_object( $my_parent ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                $parent_id = $my_parent->ID;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -906,7 +906,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->_page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page, $to_display );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                unset( $children_pages[ $parent ] ); //required in order to keep track of orphans

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         unset( $children_pages[ $parent ] ); // Required in order to keep track of orphans.

</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">@@ -1467,6 +1467,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $taxonomy_names          = get_object_taxonomies( $screen->post_type );

</span><span class="cx" style="display: block; padding: 0 10px">                $hierarchical_taxonomies = array();

</span><span class="cx" style="display: block; padding: 0 10px">                $flat_taxonomies         = array();

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $taxonomy_names as $taxonomy_name ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $taxonomy = get_taxonomy( $taxonomy_name );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1507,7 +1508,8 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                ?>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        <form method="get"><table style="display: none"><tbody id="inlineedit">

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <form method="get">

+               <table style="display: none"><tbody id="inlineedit">

</ins><span class="cx" style="display: block; padding: 0 10px">                 <?php

</span><span class="cx" style="display: block; padding: 0 10px">                $hclass              = count( $hierarchical_taxonomies ) ? 'post' : 'page';

</span><span class="cx" style="display: block; padding: 0 10px">                $inline_edit_classes = "inline-edit-row inline-edit-row-$hclass";

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1515,347 +1517,359 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $quick_edit_classes  = "quick-edit-row quick-edit-row-$hclass inline-edit-{$screen->post_type}";

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $bulk = 0;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                while ( $bulk < 2 ) {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         while ( $bulk < 2 ) :

+                       $classes  = $inline_edit_classes . ' ';

+                       $classes .= $bulk ? $bulk_edit_classes : $quick_edit_classes;

</ins><span class="cx" style="display: block; padding: 0 10px">                         ?>

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        <tr id="<?php echo $bulk ? 'bulk-edit' : 'inline-edit'; ?>" class="<?php echo $classes; ?>" style="display: none">

+                       <td colspan="<?php echo $this->get_column_count(); ?>" class="colspanchange">

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <tr id="<?php echo $bulk ? 'bulk-edit' : 'inline-edit'; ?>" class="

-                                                       <?php

-                                                       echo $inline_edit_classes . ' ';

-                                                       echo $bulk ? $bulk_edit_classes : $quick_edit_classes;

-                                                       ?>

-               " style="display: none"><td colspan="<?php echo $this->get_column_count(); ?>" class="colspanchange">

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <fieldset class="inline-edit-col-left">

+                               <legend class="inline-edit-legend"><?php echo $bulk ? __( 'Bulk Edit' ) : __( 'Quick Edit' ); ?></legend>

+                               <div class="inline-edit-col">

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <fieldset class="inline-edit-col-left">

-                       <legend class="inline-edit-legend"><?php echo $bulk ? __( 'Bulk Edit' ) : __( 'Quick Edit' ); ?></legend>

-                       <div class="inline-edit-col">

-                       <?php

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <?php if ( post_type_supports( $screen->post_type, 'title' ) ) : ?>

</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 ( post_type_supports( $screen->post_type, 'title' ) ) :

-                               if ( $bulk ) :

-                                       ?>

-                       <div id="bulk-title-div">

-                               <div id="bulk-titles"></div>

-                       </div>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <?php if ( $bulk ) : ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <?php else : // $bulk ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <div id="bulk-title-div">

+                                                       <div id="bulk-titles"></div>

+                                               </div>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <label>

-                               <span class="title"><?php _e( 'Title' ); ?></span>

-                               <span class="input-text-wrap"><input type="text" name="post_title" class="ptitle" value="" /></span>

-                       </label>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <?php else : // $bulk ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <?php if ( is_post_type_viewable( $screen->post_type ) ) : // is_post_type_viewable check ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <label>

+                                                       <span class="title"><?php _e( 'Title' ); ?></span>

+                                                       <span class="input-text-wrap"><input type="text" name="post_title" class="ptitle" value="" /></span>

+                                               </label>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <label>

-                               <span class="title"><?php _e( 'Slug' ); ?></span>

-                               <span class="input-text-wrap"><input type="text" name="post_name" value="" /></span>

-                       </label>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <?php if ( is_post_type_viewable( $screen->post_type ) ) : ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <?php

-       endif; // is_post_type_viewable check

-       endif; // $bulk

-       endif; // post_type_supports title

-                       ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 <label>

+                                                               <span class="title"><?php _e( 'Slug' ); ?></span>

+                                                               <span class="input-text-wrap"><input type="text" name="post_name" value="" /></span>

+                                                       </label>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <?php if ( ! $bulk ) : ?>

-                       <fieldset class="inline-edit-date">

-                       <legend><span class="title"><?php _e( 'Date' ); ?></span></legend>

-                               <?php touch_time( 1, 1, 0, 1 ); ?>

-                       </fieldset>

-                       <br class="clear" />

-                               <?php

-       endif; // $bulk

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <?php endif; // is_post_type_viewable() ?>

</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 ( post_type_supports( $screen->post_type, 'author' ) ) :

-                               $authors_dropdown = '';

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <?php endif; // $bulk ?>

</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 ( current_user_can( $post_type_object->cap->edit_others_posts ) ) :

-                                       $users_opt = array(

-                                               'hide_if_only_one_author' => false,

-                                               'who'                     => 'authors',

-                                               'name'                    => 'post_author',

-                                               'class'                   => 'authors',

-                                               'multi'                   => 1,

-                                               'echo'                    => 0,

-                                               'show'                    => 'display_name_with_login',

-                                       );

-                                       if ( $bulk ) {

-                                               $users_opt['show_option_none'] = __( '&mdash; No Change &mdash;' );

-                                       }

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <?php endif; // post_type_supports( ... 'title' ) ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        $authors = wp_dropdown_users( $users_opt );

-                                       if ( $authors ) :

-                                               $authors_dropdown  = '<label class="inline-edit-author">';

-                                               $authors_dropdown .= '<span class="title">' . __( 'Author' ) . '</span>';

-                                               $authors_dropdown .= $authors;

-                                               $authors_dropdown .= '</label>';

-                                       endif;

-                               endif; // authors

-                               ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <?php if ( ! $bulk ) : ?>

+                                       <fieldset class="inline-edit-date">

+                                               <legend><span class="title"><?php _e( 'Date' ); ?></span></legend>

+                                               <?php touch_time( 1, 1, 0, 1 ); ?>

+                                       </fieldset>

+                                       <br class="clear" />

+                               <?php endif; // $bulk ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                <?php

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                if ( ! $bulk ) {

-                                       echo $authors_dropdown;}

-       endif; // post_type_supports author

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         if ( post_type_supports( $screen->post_type, 'author' ) ) :

+                                       $authors_dropdown = '';

</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 ( ! $bulk && $can_publish ) :

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 if ( current_user_can( $post_type_object->cap->edit_others_posts ) ) :

+                                               $users_opt = array(

+                                                       'hide_if_only_one_author' => false,

+                                                       'who'                     => 'authors',

+                                                       'name'                    => 'post_author',

+                                                       'class'                   => 'authors',

+                                                       'multi'                   => 1,

+                                                       'echo'                    => 0,

+                                                       'show'                    => 'display_name_with_login',

+                                               );

+

+                                               if ( $bulk ) {

+                                                       $users_opt['show_option_none'] = __( '&mdash; No Change &mdash;' );

+                                               }

+

+                                               $authors = wp_dropdown_users( $users_opt );

+                                               if ( $authors ) :

+                                                       $authors_dropdown  = '<label class="inline-edit-author">';

+                                                       $authors_dropdown .= '<span class="title">' . __( 'Author' ) . '</span>';

+                                                       $authors_dropdown .= $authors;

+                                                       $authors_dropdown .= '</label>';

+                                               endif;

+                                       endif; // current_user_can( 'edit_others_posts' )

+                                       ?>

+

+                                       <?php

+                                       if ( ! $bulk ) {

+                                               echo $authors_dropdown;

+                                       }

+                               endif; // post_type_supports( ... 'author' )

</ins><span class="cx" style="display: block; padding: 0 10px">                                 ?>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <div class="inline-edit-group wp-clearfix">

-                       <label class="alignleft">

-                               <span class="title"><?php _e( 'Password' ); ?></span>

-                               <span class="input-text-wrap"><input type="text" name="post_password" class="inline-edit-password-input" value="" /></span>

-                       </label>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <?php if ( ! $bulk && $can_publish ) : ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <em class="alignleft inline-edit-or">

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <div class="inline-edit-group wp-clearfix">

+                                               <label class="alignleft">

+                                                       <span class="title"><?php _e( 'Password' ); ?></span>

+                                                       <span class="input-text-wrap"><input type="text" name="post_password" class="inline-edit-password-input" value="" /></span>

+                                               </label>

+

+                                               <em class="alignleft inline-edit-or">

+                                                       <?php

+                                                       /* translators: Between password field and private checkbox on post quick edit interface. */

+                                                       _e( '&ndash;OR&ndash;' );

+                                                       ?>

+                                               </em>

+                                               <label class="alignleft inline-edit-private">

+                                                       <input type="checkbox" name="keep_private" value="private" />

+                                                       <span class="checkbox-title"><?php _e( 'Private' ); ?></span>

+                                               </label>

+                                       </div>

+

+                               <?php endif; ?>

+

+                               </div>

+                       </fieldset>

+

+                       <?php if ( count( $hierarchical_taxonomies ) && ! $bulk ) : ?>

+

+                               <fieldset class="inline-edit-col-center inline-edit-categories">

+                                       <div class="inline-edit-col">

+

+                                       <?php foreach ( $hierarchical_taxonomies as $taxonomy ) : ?>

+

+                                               <span class="title inline-edit-categories-label"><?php echo esc_html( $taxonomy->labels->name ); ?></span>

+                                               <input type="hidden" name="<?php echo ( $taxonomy->name === 'category' ) ? 'post_category[]' : 'tax_input[' . esc_attr( $taxonomy->name ) . '][]'; ?>" value="0" />

+                                               <ul class="cat-checklist <?php echo esc_attr( $taxonomy->name ); ?>-checklist">

+                                                       <?php wp_terms_checklist( null, array( 'taxonomy' => $taxonomy->name ) ); ?>

+                                               </ul>

+

+                                       <?php endforeach; // $hierarchical_taxonomies as $taxonomy ?>

+

+                                       </div>

+                               </fieldset>

+

+                       <?php endif; // count( $hierarchical_taxonomies ) && ! $bulk ?>

+

+                       <fieldset class="inline-edit-col-right">

+                               <div class="inline-edit-col">

+

</ins><span class="cx" style="display: block; padding: 0 10px">                                 <?php

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                /* translators: Between password field and private checkbox on post quick edit interface. */

-                               _e( '&ndash;OR&ndash;' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         if ( post_type_supports( $screen->post_type, 'author' ) && $bulk ) {

+                                       echo $authors_dropdown;

+                               }

</ins><span class="cx" style="display: block; padding: 0 10px">                                 ?>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                </em>

-                               <label class="alignleft inline-edit-private">

-                               <input type="checkbox" name="keep_private" value="private" />

-                               <span class="checkbox-title"><?php _e( 'Private' ); ?></span>

-                               </label>

-                       </div>

</del><span class="cx" style="display: block; padding: 0 10px"> 

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                <?php if ( post_type_supports( $screen->post_type, 'page-attributes' ) ) : ?>

+

+                                       <?php if ( $post_type_object->hierarchical ) : ?>

+

+                                               <label>

+                                                       <span class="title"><?php _e( 'Parent' ); ?></span>

+                                                       <?php

+                                                       $dropdown_args = array(

+                                                               'post_type'         => $post_type_object->name,

+                                                               'selected'          => $post->post_parent,

+                                                               'name'              => 'post_parent',

+                                                               'show_option_none'  => __( 'Main Page (no parent)' ),

+                                                               'option_none_value' => 0,

+                                                               'sort_column'       => 'menu_order, post_title',

+                                                       );

+

+                                                       if ( $bulk ) {

+                                                               $dropdown_args['show_option_no_change'] = __( '&mdash; No Change &mdash;' );

+                                                       }

+

+                                                       /**

+                                                        * Filters the arguments used to generate the Quick Edit page-parent drop-down.

+                                                        *

+                                                        * @since 2.7.0

+                                                        *

+                                                        * @see wp_dropdown_pages()

+                                                        *

+                                                        * @param array $dropdown_args An array of arguments.

+                                                        */

+                                                       $dropdown_args = apply_filters( 'quick_edit_dropdown_pages_args', $dropdown_args );

+

+                                                       wp_dropdown_pages( $dropdown_args );

+                                                       ?>

+                                               </label>

+

+                                       <?php endif; // hierarchical ?>

+

+                                       <?php if ( ! $bulk ) : ?>

+

+                                               <label>

+                                                       <span class="title"><?php _e( 'Order' ); ?></span>

+                                                       <span class="input-text-wrap"><input type="text" name="menu_order" class="inline-edit-menu-order-input" value="<?php echo $post->menu_order; ?>" /></span>

+                                               </label>

+

+                                       <?php endif; // ! $bulk ?>

+

+                               <?php endif; // post_type_supports( ... 'page-attributes' ) ?>

+

+                               <?php if ( 0 < count( get_page_templates( null, $screen->post_type ) ) ) : ?>

+

+                                       <label>

+                                               <span class="title"><?php _e( 'Template' ); ?></span>

+                                               <select name="page_template">

+                                                       <?php if ( $bulk ) : ?>

+                                                       <option value="-1"><?php _e( '&mdash; No Change &mdash;' ); ?></option>

+                                                       <?php endif; // $bulk ?>

+                                                       <?php

+                                                       /** This filter is documented in wp-admin/includes/meta-boxes.php */

+                                                       $default_title = apply_filters( 'default_page_template_title', __( 'Default Template' ), 'quick-edit' );

+                                                       ?>

+                                                       <option value="default"><?php echo esc_html( $default_title ); ?></option>

+                                                       <?php page_template_dropdown( '', $screen->post_type ); ?>

+                                               </select>

+                                       </label>

+

</ins><span class="cx" style="display: block; padding: 0 10px">                                 <?php endif; ?>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                </div></fieldset>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <?php if ( count( $flat_taxonomies ) && ! $bulk ) : ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <?php if ( count( $hierarchical_taxonomies ) && ! $bulk ) : ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <?php foreach ( $flat_taxonomies as $taxonomy ) : ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <fieldset class="inline-edit-col-center inline-edit-categories"><div class="inline-edit-col">

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <?php if ( current_user_can( $taxonomy->cap->assign_terms ) ) : ?>

+                                                       <?php $taxonomy_name = esc_attr( $taxonomy->name ); ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <?php foreach ( $hierarchical_taxonomies as $taxonomy ) : ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 <label class="inline-edit-tags">

+                                                               <span class="title"><?php echo esc_html( $taxonomy->labels->name ); ?></span>

+                                                               <textarea data-wp-taxonomy="<?php echo $taxonomy_name; ?>" cols="22" rows="1" name="tax_input[<?php echo $taxonomy_name; ?>]" class="tax_input_<?php echo $taxonomy_name; ?>"></textarea>

+                                                       </label>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <span class="title inline-edit-categories-label"><?php echo esc_html( $taxonomy->labels->name ); ?></span>

-                       <input type="hidden" name="<?php echo ( $taxonomy->name === 'category' ) ? 'post_category[]' : 'tax_input[' . esc_attr( $taxonomy->name ) . '][]'; ?>" value="0" />

-                       <ul class="cat-checklist <?php echo esc_attr( $taxonomy->name ); ?>-checklist">

-                                       <?php wp_terms_checklist( null, array( 'taxonomy' => $taxonomy->name ) ); ?>

-                       </ul>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <?php endif; // current_user_can( 'assign_terms' ) ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        <?php endforeach; //$hierarchical_taxonomies as $taxonomy ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <?php endforeach; // $flat_taxonomies as $taxonomy ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                </div></fieldset>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <?php endif; // count( $flat_taxonomies ) && ! $bulk ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        <?php endif; // count( $hierarchical_taxonomies ) && !$bulk ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <?php if ( post_type_supports( $screen->post_type, 'comments' ) || post_type_supports( $screen->post_type, 'trackbacks' ) ) : ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <fieldset class="inline-edit-col-right"><div class="inline-edit-col">

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <?php if ( $bulk ) : ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <?php

-                       if ( post_type_supports( $screen->post_type, 'author' ) && $bulk ) {

-                               echo $authors_dropdown;

-                       }

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <div class="inline-edit-group wp-clearfix">

</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 ( post_type_supports( $screen->post_type, 'page-attributes' ) ) :

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <?php if ( post_type_supports( $screen->post_type, 'comments' ) ) : ?>

</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 ( $post_type_object->hierarchical ) :

-                                       ?>

-               <label>

-                       <span class="title"><?php _e( 'Parent' ); ?></span>

-                                       <?php

-                                       $dropdown_args = array(

-                                               'post_type'         => $post_type_object->name,

-                                               'selected'          => $post->post_parent,

-                                               'name'              => 'post_parent',

-                                               'show_option_none'  => __( 'Main Page (no parent)' ),

-                                               'option_none_value' => 0,

-                                               'sort_column'       => 'menu_order, post_title',

-                                       );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 <label class="alignleft">

+                                                               <span class="title"><?php _e( 'Comments' ); ?></span>

+                                                               <select name="comment_status">

+                                                                       <option value=""><?php _e( '&mdash; No Change &mdash;' ); ?></option>

+                                                                       <option value="open"><?php _e( 'Allow' ); ?></option>

+                                                                       <option value="closed"><?php _e( 'Do not allow' ); ?></option>

+                                                               </select>

+                                                       </label>

</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 ( $bulk ) {

-                                               $dropdown_args['show_option_no_change'] = __( '&mdash; No Change &mdash;' );

-                                       }

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <?php endif; ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        /**

-                                        * Filters the arguments used to generate the Quick Edit page-parent drop-down.

-                                        *

-                                        * @since 2.7.0

-                                        *

-                                        * @see wp_dropdown_pages()

-                                        *

-                                        * @param array $dropdown_args An array of arguments.

-                                        */

-                                       $dropdown_args = apply_filters( 'quick_edit_dropdown_pages_args', $dropdown_args );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <?php if ( post_type_supports( $screen->post_type, 'trackbacks' ) ) : ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        wp_dropdown_pages( $dropdown_args );

-                                       ?>

-               </label>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 <label class="alignright">

+                                                               <span class="title"><?php _e( 'Pings' ); ?></span>

+                                                               <select name="ping_status">

+                                                                       <option value=""><?php _e( '&mdash; No Change &mdash;' ); ?></option>

+                                                                       <option value="open"><?php _e( 'Allow' ); ?></option>

+                                                                       <option value="closed"><?php _e( 'Do not allow' ); ?></option>

+                                                               </select>

+                                                       </label>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <?php

-                               endif; // hierarchical

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <?php endif; ?>

</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 ( ! $bulk ) :

-                                       ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         </div>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <label>

-                               <span class="title"><?php _e( 'Order' ); ?></span>

-                               <span class="input-text-wrap"><input type="text" name="menu_order" class="inline-edit-menu-order-input" value="<?php echo $post->menu_order; ?>" /></span>

-                       </label>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <?php else : // $bulk ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <?php

-                               endif; // !$bulk

-               endif; // page-attributes

-                       ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <div class="inline-edit-group wp-clearfix">

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <?php if ( 0 < count( get_page_templates( null, $screen->post_type ) ) ) : ?>

-               <label>

-                       <span class="title"><?php _e( 'Template' ); ?></span>

-                       <select name="page_template">

-                               <?php        if ( $bulk ) : ?>

-                               <option value="-1"><?php _e( '&mdash; No Change &mdash;' ); ?></option>

-                               <?php        endif; // $bulk ?>

-                               <?php

-                               /** This filter is documented in wp-admin/includes/meta-boxes.php */

-                               $default_title = apply_filters( 'default_page_template_title', __( 'Default Template' ), 'quick-edit' );

-                               ?>

-                               <option value="default"><?php echo esc_html( $default_title ); ?></option>

-                               <?php page_template_dropdown( '', $screen->post_type ); ?>

-                       </select>

-               </label>

-       <?php endif; ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <?php if ( post_type_supports( $screen->post_type, 'comments' ) ) : ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <?php if ( count( $flat_taxonomies ) && ! $bulk ) : ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 <label class="alignleft">

+                                                               <input type="checkbox" name="comment_status" value="open" />

+                                                               <span class="checkbox-title"><?php _e( 'Allow Comments' ); ?></span>

+                                                       </label>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <?php foreach ( $flat_taxonomies as $taxonomy ) : ?>

-                                       <?php

-                                       if ( current_user_can( $taxonomy->cap->assign_terms ) ) :

-                                               $taxonomy_name = esc_attr( $taxonomy->name );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <?php endif; ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                ?>

-                       <label class="inline-edit-tags">

-                               <span class="title"><?php echo esc_html( $taxonomy->labels->name ); ?></span>

-                               <textarea data-wp-taxonomy="<?php echo $taxonomy_name; ?>" cols="22" rows="1" name="tax_input[<?php echo $taxonomy_name; ?>]" class="tax_input_<?php echo $taxonomy_name; ?>"></textarea>

-                       </label>

-                                       <?php endif; ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <?php if ( post_type_supports( $screen->post_type, 'trackbacks' ) ) : ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        <?php endforeach; //$flat_taxonomies as $taxonomy ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 <label class="alignleft">

+                                                               <input type="checkbox" name="ping_status" value="open" />

+                                                               <span class="checkbox-title"><?php _e( 'Allow Pings' ); ?></span>

+                                                       </label>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        <?php endif; // count( $flat_taxonomies ) && !$bulk ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <?php endif; ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <?php

-                       if ( post_type_supports( $screen->post_type, 'comments' ) || post_type_supports( $screen->post_type, 'trackbacks' ) ) :

-                               if ( $bulk ) :

-                                       ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         </div>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <div class="inline-edit-group wp-clearfix">

-                                       <?php if ( post_type_supports( $screen->post_type, 'comments' ) ) : ?>

-                       <label class="alignleft">

-                               <span class="title"><?php _e( 'Comments' ); ?></span>

-                               <select name="comment_status">

-                                       <option value=""><?php _e( '&mdash; No Change &mdash;' ); ?></option>

-                                       <option value="open"><?php _e( 'Allow' ); ?></option>

-                                       <option value="closed"><?php _e( 'Do not allow' ); ?></option>

-                               </select>

-                       </label>

-               <?php endif; if ( post_type_supports( $screen->post_type, 'trackbacks' ) ) : ?>

-                       <label class="alignright">

-                               <span class="title"><?php _e( 'Pings' ); ?></span>

-                               <select name="ping_status">

-                                       <option value=""><?php _e( '&mdash; No Change &mdash;' ); ?></option>

-                                       <option value="open"><?php _e( 'Allow' ); ?></option>

-                                       <option value="closed"><?php _e( 'Do not allow' ); ?></option>

-                               </select>

-                       </label>

-               <?php endif; ?>

-                       </div>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <?php endif; // $bulk ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <?php else : // $bulk ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <?php endif; // post_type_supports( ... comments or pings ) ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <div class="inline-edit-group wp-clearfix">

-                               <?php if ( post_type_supports( $screen->post_type, 'comments' ) ) : ?>

-                               <label class="alignleft">

-                                       <input type="checkbox" name="comment_status" value="open" />

-                                       <span class="checkbox-title"><?php _e( 'Allow Comments' ); ?></span>

-                               </label>

-                       <?php endif; if ( post_type_supports( $screen->post_type, 'trackbacks' ) ) : ?>

-                               <label class="alignleft">

-                                       <input type="checkbox" name="ping_status" value="open" />

-                                       <span class="checkbox-title"><?php _e( 'Allow Pings' ); ?></span>

-                               </label>

-                       <?php endif; ?>

-                       </div>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <div class="inline-edit-group wp-clearfix">

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <?php

-       endif; // $bulk

-       endif; // post_type_supports comments or pings

-                       ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <label class="inline-edit-status alignleft">

+                                                       <span class="title"><?php _e( 'Status' ); ?></span>

+                                                       <select name="_status">

+                                                               <?php if ( $bulk ) : ?>

+                                                                       <option value="-1"><?php _e( '&mdash; No Change &mdash;' ); ?></option>

+                                                               <?php endif; // $bulk ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <div class="inline-edit-group wp-clearfix">

-                               <label class="inline-edit-status alignleft">

-                                       <span class="title"><?php _e( 'Status' ); ?></span>

-                                       <select name="_status">

-                       <?php if ( $bulk ) : ?>

-                                               <option value="-1"><?php _e( '&mdash; No Change &mdash;' ); ?></option>

-       <?php endif; // $bulk ?>

-                                       <?php if ( $can_publish ) : // Contributors only get "Unpublished" and "Pending Review" ?>

-                                               <option value="publish"><?php _e( 'Published' ); ?></option>

-                                               <option value="future"><?php _e( 'Scheduled' ); ?></option>

-                                               <?php if ( $bulk ) : ?>

-                                               <option value="private"><?php _e( 'Private' ); ?></option>

-       <?php endif; // $bulk ?>

-                                       <?php endif; ?>

-                                               <option value="pending"><?php _e( 'Pending Review' ); ?></option>

-                                               <option value="draft"><?php _e( 'Draft' ); ?></option>

-                                       </select>

-                               </label>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                         <?php if ( $can_publish ) : // Contributors only get "Unpublished" and "Pending Review". ?>

+                                                                       <option value="publish"><?php _e( 'Published' ); ?></option>

+                                                                       <option value="future"><?php _e( 'Scheduled' ); ?></option>

+                                                                       <?php if ( $bulk ) : ?>

+                                                                               <option value="private"><?php _e( 'Private' ); ?></option>

+                                                                       <?php endif; // $bulk ?>

+                                                               <?php endif; ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <?php if ( 'post' === $screen->post_type && $can_publish && current_user_can( $post_type_object->cap->edit_others_posts ) ) : ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                         <option value="pending"><?php _e( 'Pending Review' ); ?></option>

+                                                               <option value="draft"><?php _e( 'Draft' ); ?></option>

+                                                       </select>

+                                               </label>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <?php        if ( $bulk ) : ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <?php if ( 'post' === $screen->post_type && $can_publish && current_user_can( $post_type_object->cap->edit_others_posts ) ) : ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <label class="alignright">

-                                       <span class="title"><?php _e( 'Sticky' ); ?></span>

-                                       <select name="sticky">

-                                               <option value="-1"><?php _e( '&mdash; No Change &mdash;' ); ?></option>

-                                               <option value="sticky"><?php _e( 'Sticky' ); ?></option>

-                                               <option value="unsticky"><?php _e( 'Not Sticky' ); ?></option>

-                                       </select>

-                               </label>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 <?php if ( $bulk ) : ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        <?php        else : // $bulk ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                         <label class="alignright">

+                                                                       <span class="title"><?php _e( 'Sticky' ); ?></span>

+                                                                       <select name="sticky">

+                                                                               <option value="-1"><?php _e( '&mdash; No Change &mdash;' ); ?></option>

+                                                                               <option value="sticky"><?php _e( 'Sticky' ); ?></option>

+                                                                               <option value="unsticky"><?php _e( 'Not Sticky' ); ?></option>

+                                                                       </select>

+                                                               </label>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <label class="alignleft">

-                                       <input type="checkbox" name="sticky" value="sticky" />

-                                       <span class="checkbox-title"><?php _e( 'Make this post sticky' ); ?></span>

-                               </label>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 <?php else : // $bulk ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        <?php        endif; // $bulk ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                         <label class="alignleft">

+                                                                       <input type="checkbox" name="sticky" value="sticky" />

+                                                                       <span class="checkbox-title"><?php _e( 'Make this post sticky' ); ?></span>

+                                                               </label>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        <?php endif; // 'post' && $can_publish && current_user_can( 'edit_others_cap' ) ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 <?php endif; // $bulk ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        </div>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <?php endif; // 'post' && $can_publish && current_user_can( 'edit_others_posts' ) ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <?php

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 </div>

</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 ( $bulk && current_theme_supports( 'post-formats' ) && post_type_supports( $screen->post_type, 'post-formats' ) ) {

-                               $post_formats = get_theme_support( 'post-formats' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <?php if ( $bulk && current_theme_supports( 'post-formats' ) && post_type_supports( $screen->post_type, 'post-formats' ) ) : ?>

+                                       <?php $post_formats = get_theme_support( 'post-formats' ); ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                ?>

-               <label class="alignleft">

-               <span class="title"><?php _ex( 'Format', 'post format' ); ?></span>

-               <select name="post_format">

-                       <option value="-1"><?php _e( '&mdash; No Change &mdash;' ); ?></option>

-                       <option value="0"><?php echo get_post_format_string( 'standard' ); ?></option>

-                               <?php

-                               if ( is_array( $post_formats[0] ) ) {

-                                       foreach ( $post_formats[0] as $format ) {

-                                               ?>

-                                       <option value="<?php echo esc_attr( $format ); ?>"><?php echo esc_html( get_post_format_string( $format ) ); ?></option>

-                                               <?php

-                                       }

-                               }

-                               ?>

-               </select></label>

-                               <?php

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <label class="alignleft">

+                                               <span class="title"><?php _ex( 'Format', 'post format' ); ?></span>

+                                               <select name="post_format">

+                                                       <option value="-1"><?php _e( '&mdash; No Change &mdash;' ); ?></option>

+                                                       <option value="0"><?php echo get_post_format_string( 'standard' ); ?></option>

+                                                       <?php if ( is_array( $post_formats[0] ) ) : ?>

+                                                               <?php foreach ( $post_formats[0] as $format ) : ?>

+                                                                       <option value="<?php echo esc_attr( $format ); ?>"><?php echo esc_html( get_post_format_string( $format ) ); ?></option>

+                                                               <?php endforeach; ?>

+                                                       <?php endif; ?>

+                                               </select>

+                                       </label>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        }

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <?php endif; ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         </div>

+                       </fieldset>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                </div></fieldset>

-

</del><span class="cx" style="display: block; padding: 0 10px">                         <?php

</span><span class="cx" style="display: block; padding: 0 10px">                        list( $columns ) = $this->get_column_info();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1890,35 +1904,38 @@

</span><span class="cx" style="display: 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">-                <div class="submit inline-edit-save">

-                       <button type="button" class="button cancel alignleft"><?php _e( 'Cancel' ); ?></button>

-                       <?php

-                       if ( ! $bulk ) {

-                               wp_nonce_field( 'inlineeditnonce', '_inline_edit', false );

-                               ?>

-                               <button type="button" class="button button-primary save alignright"><?php _e( 'Update' ); ?></button>

-                               <span class="spinner"></span>

-                               <?php

-                       } else {

-                               submit_button( __( 'Update' ), 'primary alignright', 'bulk_edit', false );

-                       }

-                       ?>

-                       <input type="hidden" name="post_view" value="<?php echo esc_attr( $m ); ?>" />

-                       <input type="hidden" name="screen" value="<?php echo esc_attr( $screen->id ); ?>" />

-                       <?php if ( ! $bulk && ! post_type_supports( $screen->post_type, 'author' ) ) { ?>

-                               <input type="hidden" name="post_author" value="<?php echo esc_attr( $post->post_author ); ?>" />

-                       <?php } ?>

-                       <br class="clear" />

-                       <div class="notice notice-error notice-alt inline hidden">

-                               <p class="error"></p>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

+                       <div class="submit inline-edit-save">

+                               <button type="button" class="button cancel alignleft"><?php _e( 'Cancel' ); ?></button>

+

+                               <?php if ( ! $bulk ) : ?>

+                                       <?php wp_nonce_field( 'inlineeditnonce', '_inline_edit', false ); ?>

+                                       <button type="button" class="button button-primary save alignright"><?php _e( 'Update' ); ?></button>

+                                       <span class="spinner"></span>

+                               <?php else : ?>

+                                       <?php submit_button( __( 'Update' ), 'primary alignright', 'bulk_edit', false ); ?>

+                               <?php endif; ?>

+

+                               <input type="hidden" name="post_view" value="<?php echo esc_attr( $m ); ?>" />

+                               <input type="hidden" name="screen" value="<?php echo esc_attr( $screen->id ); ?>" />

+                               <?php if ( ! $bulk && ! post_type_supports( $screen->post_type, 'author' ) ) : ?>

+                                       <input type="hidden" name="post_author" value="<?php echo esc_attr( $post->post_author ); ?>" />

+                               <?php endif; ?>

+                               <br class="clear" />

+

+                               <div class="notice notice-error notice-alt inline hidden">

+                                       <p class="error"></p>

+                               </div>

</ins><span class="cx" style="display: block; padding: 0 10px">                         </div>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                </div>

-               </td></tr>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

+                       </td></tr>

+

</ins><span class="cx" style="display: block; padding: 0 10px">                         <?php

</span><span class="cx" style="display: block; padding: 0 10px">                        $bulk++;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                }

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         endwhile;

</ins><span class="cx" style="display: block; padding: 0 10px">                 ?>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                </tbody></table></form>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         </tbody></table>

+               </form>

</ins><span class="cx" style="display: block; padding: 0 10px">                 <?php

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span></span></pre></div>

<a id="trunksrcwpadminincludesclasswpprivacyrequeststablephp"></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-privacy-requests-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-privacy-requests-table.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/class-wp-privacy-requests-table.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,9 +73,11 @@

<span class="cx" style="display: block; padding: 0 10px">         * @return array Default sortable columns.

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        protected function get_sortable_columns() {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // The initial sorting is by 'Requested' (post_date) and descending.

-               // With initial sorting, the first click on 'Requested' should be ascending.

-               // With 'Requester' sorting active, the next click on 'Requested' should be descending.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /*

+                * The initial sorting is by 'Requested' (post_date) and descending.

+                * With initial sorting, the first click on 'Requested' should be ascending.

+                * With 'Requester' sorting active, the next click on 'Requested' should be descending.

+                */

</ins><span class="cx" style="display: block; padding: 0 10px">                 $desc_first = isset( $_GET['orderby'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                return array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -146,7 +148,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $counts         = $this->get_request_counts();

</span><span class="cx" style="display: block; padding: 0 10px">                $total_requests = absint( array_sum( (array) $counts ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Normalized admin URL

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Normalized admin URL.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $admin_url = $this->get_admin_url();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $current_link_attributes = empty( $current_status ) ? ' class="current" aria-current="page"' : '';

</span></span></pre></div>

<a id="trunksrcwpadminincludesclasswpscreenphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-screen.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-screen.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/class-wp-screen.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -226,7 +226,7 @@

<span class="cx" style="display: block; padding: 0 10px">                // For those pesky meta boxes.

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $hook_name && post_type_exists( $hook_name ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $post_type = $id;

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $id        = 'post'; // changes later. ends up being $base.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $id        = 'post'; // Changes later. Ends up being $base.

</ins><span class="cx" style="display: block; padding: 0 10px">                 } else {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( '.php' == substr( $id, -4 ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $id = substr( $id, 0, -4 );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -923,7 +923,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                </div>

</span><span class="cx" style="display: block; padding: 0 10px">                        </div>

</span><span class="cx" style="display: block; padding: 0 10px">                <?php

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Setup layout columns

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Setup layout columns.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                /**

<span class="cx" style="display: block; padding: 0 10px">                 * Filters the array of screen layout columns.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -952,7 +952,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

<span class="cx" style="display: block; padding: 0 10px">                $GLOBALS['screen_layout_columns'] = $this->columns; // Set the global for back-compat.

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Add screen options

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Add screen options.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $this->show_screen_options() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->render_screen_options();

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1156,7 +1156,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $special = array( '_title', 'cb', 'comment', 'media', 'name', 'title', 'username', 'blogname' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $columns as $column => $title ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Can't hide these for they are special

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Can't hide these for they are special.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( in_array( $column, $special ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                continue;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1255,13 +1255,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $per_page = apply_filters( "{$option}", $per_page );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Back compat

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Back compat.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( isset( $this->post_type ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        /** This filter is documented in wp-admin/includes/post.php */

</span><span class="cx" style="display: block; padding: 0 10px">                        $per_page = apply_filters( 'edit_posts_per_page', $per_page, $this->post_type );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // This needs a submit button

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // This needs a submit button.

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_filter( 'screen_options_show_submit', '__return_true' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                ?>

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1288,7 +1288,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function render_view_mode() {

</span><span class="cx" style="display: block; padding: 0 10px">                $screen = get_current_screen();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Currently only enabled for posts lists

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Currently only enabled for posts lists.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( 'edit' !== $screen->base ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1316,7 +1316,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                global $mode;

</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 needs a submit button

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // This needs a submit button.

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_filter( 'screen_options_show_submit', '__return_true' );

</span><span class="cx" style="display: block; padding: 0 10px">                ?>

</span><span class="cx" style="display: block; padding: 0 10px">                <fieldset class="metabox-prefs view-mode">

</span></span></pre></div>

<a id="trunksrcwpadminincludesclasswpsitehealthautoupdatesphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-site-health-auto-updates.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-site-health-auto-updates.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/class-wp-site-health-auto-updates.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -353,12 +353,12 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $checksums = get_core_checksums( $wp_version, 'en_US' );

</span><span class="cx" style="display: block; padding: 0 10px">                $dev       = ( false !== strpos( $wp_version, '-' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Get the last stable version's files and test against that

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Get the last stable version's files and test against that.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! $checksums && $dev ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $checksums = get_core_checksums( (float) $wp_version - 0.1, 'en_US' );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // There aren't always checksums for development releases, so just skip the test if we still can't find any

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // There aren't always checksums for development releases, so just skip the test if we still can't find any.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! $checksums && $dev ) {

</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">@@ -415,7 +415,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_accepts_dev_updates() {

</span><span class="cx" style="display: block; padding: 0 10px">                include ABSPATH . WPINC . '/version.php'; // $wp_version; // x.y.z

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Only for dev versions

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Only for dev versions.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( false === strpos( $wp_version, '-' ) ) {

</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="trunksrcwpadminincludesclasswpsitehealthphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-site-health.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-site-health.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/class-wp-site-health.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -103,7 +103,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                if ( 'site-health' === $screen->id && ! isset( $_GET['tab'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $tests = WP_Site_Health::get_tests();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Don't run https test on localhost

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Don't run https test on localhost.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( 'localhost' === preg_replace( '|https?://|', '', get_site_url() ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                unset( $tests['direct']['https_status'] );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1217,7 +1217,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        __( 'Your MySQL version supports utf8mb4.' )

</span><span class="cx" style="display: block; padding: 0 10px">                                );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                } else { // MariaDB introduced utf8mb4 support in 5.5.0

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         } else { // MariaDB introduced utf8mb4 support in 5.5.0.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( version_compare( $this->mysql_server_version, '5.5.0', '<' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $result['status'] = 'recommended';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2235,7 +2235,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'critical'    => 0,

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Don't run https test on localhost

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Don't run https test on localhost.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( 'localhost' === preg_replace( '|https?://|', '', get_site_url() ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        unset( $tests['direct']['https_status'] );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span></span></pre></div>

<a id="trunksrcwpadminincludesclasswpsiteiconphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-site-icon.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-site-icon.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/class-wp-site-icon.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -154,7 +154,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                natsort( $this->site_icon_sizes );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->site_icon_sizes = array_reverse( $this->site_icon_sizes );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // ensure that we only resize the image into

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Ensure that we only resize the image into sizes that allow cropping.

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $sizes as $name => $size_array ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( isset( $size_array['crop'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $only_crop_sizes[ $name ] = $size_array;

</span></span></pre></div>

<a id="trunksrcwpadminincludesclasswptermslisttablephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-terms-list-table.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-terms-list-table.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/class-wp-terms-list-table.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -139,7 +139,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @return bool

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function has_items() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // todo: populate $this->items in prepare_items()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // @todo Populate $this->items in prepare_items().

</ins><span class="cx" style="display: block; padding: 0 10px">                 return true;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -254,7 +254,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        } else {

</span><span class="cx" style="display: block; padding: 0 10px">                                $children = _get_term_hierarchy( $taxonomy );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Some funky recursion to get the job done( Paging & parents mainly ) is contained within, Skip it for non-hierarchical taxonomies for performance sake

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

+                       /*

+                        * Some funky recursion to get the job done (paging & parents mainly) is contained within.

+                        * Skip it for non-hierarchical taxonomies for performance sake.

+                        */

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->_rows( $taxonomy, $terms, $children, $offset, $number, $count );

</span><span class="cx" style="display: block; padding: 0 10px">                } else {

</span><span class="cx" style="display: block; padding: 0 10px">                        foreach ( $terms as $term ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -628,9 +632,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">                ?>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        <form method="get"><table style="display: none"><tbody id="inlineedit">

-               <tr id="inline-edit" class="inline-edit-row" style="display: none"><td colspan="<?php echo $this->get_column_count(); ?>" class="colspanchange">

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <form method="get">

+               <table style="display: none"><tbody id="inlineedit">

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        <tr id="inline-edit" class="inline-edit-row" style="display: none">

+                       <td colspan="<?php echo $this->get_column_count(); ?>" class="colspanchange">

+

</ins><span class="cx" style="display: block; padding: 0 10px">                         <fieldset>

</span><span class="cx" style="display: block; padding: 0 10px">                                <legend class="inline-edit-legend"><?php _e( 'Quick Edit' ); ?></legend>

</span><span class="cx" style="display: block; padding: 0 10px">                                <div class="inline-edit-col">

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -638,50 +645,56 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        <span class="title"><?php _ex( 'Name', 'term name' ); ?></span>

</span><span class="cx" style="display: block; padding: 0 10px">                                        <span class="input-text-wrap"><input type="text" name="name" class="ptitle" value="" /></span>

</span><span class="cx" style="display: block; padding: 0 10px">                                </label>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <?php if ( ! global_terms_enabled() ) { ?>

-                               <label>

-                                       <span class="title"><?php _e( 'Slug' ); ?></span>

-                                       <span class="input-text-wrap"><input type="text" name="slug" class="ptitle" value="" /></span>

-                               </label>

-       <?php } ?>

-                       </div></fieldset>

-               <?php

</del><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $core_columns = array(

-                       'cb'          => true,

-                       'description' => true,

-                       'name'        => true,

-                       'slug'        => true,

-                       'posts'       => true,

-               );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <?php if ( ! global_terms_enabled() ) : ?>

+                                       <label>

+                                               <span class="title"><?php _e( 'Slug' ); ?></span>

+                                               <span class="input-text-wrap"><input type="text" name="slug" class="ptitle" value="" /></span>

+                                       </label>

+                               <?php endif; ?>

+                               </div>

+                       </fieldset>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                list( $columns ) = $this->get_column_info();

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <?php

+                       $core_columns = array(

+                               'cb'          => true,

+                               'description' => true,

+                               'name'        => true,

+                               'slug'        => true,

+                               'posts'       => true,

+                       );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                foreach ( $columns as $column_name => $column_display_name ) {

-                       if ( isset( $core_columns[ $column_name ] ) ) {

-                               continue;

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 list( $columns ) = $this->get_column_info();

+

+                       foreach ( $columns as $column_name => $column_display_name ) {

+                               if ( isset( $core_columns[ $column_name ] ) ) {

+                                       continue;

+                               }

+

+                               /** This action is documented in wp-admin/includes/class-wp-posts-list-table.php */

+                               do_action( 'quick_edit_custom_box', $column_name, 'edit-tags', $this->screen->taxonomy );

</ins><span class="cx" style="display: block; padding: 0 10px">                         }

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        /** This action is documented in wp-admin/includes/class-wp-posts-list-table.php */

-                       do_action( 'quick_edit_custom_box', $column_name, 'edit-tags', $this->screen->taxonomy );

-               }

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <div class="inline-edit-save submit">

+                               <button type="button" class="cancel button alignleft"><?php _e( 'Cancel' ); ?></button>

+                               <button type="button" class="save button button-primary alignright"><?php echo $tax->labels->update_item; ?></button>

+                               <span class="spinner"></span>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <?php wp_nonce_field( 'taxinlineeditnonce', '_inline_edit', false ); ?>

+                               <input type="hidden" name="taxonomy" value="<?php echo esc_attr( $this->screen->taxonomy ); ?>" />

+                               <input type="hidden" name="post_type" value="<?php echo esc_attr( $this->screen->post_type ); ?>" />

+                               <br class="clear" />

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <div class="inline-edit-save submit">

-                       <button type="button" class="cancel button alignleft"><?php _e( 'Cancel' ); ?></button>

-                       <button type="button" class="save button button-primary alignright"><?php echo $tax->labels->update_item; ?></button>

-                       <span class="spinner"></span>

-                       <?php wp_nonce_field( 'taxinlineeditnonce', '_inline_edit', false ); ?>

-                       <input type="hidden" name="taxonomy" value="<?php echo esc_attr( $this->screen->taxonomy ); ?>" />

-                       <input type="hidden" name="post_type" value="<?php echo esc_attr( $this->screen->post_type ); ?>" />

-                       <br class="clear" />

-                       <div class="notice notice-error notice-alt inline hidden">

-                               <p class="error"></p>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <div class="notice notice-error notice-alt inline hidden">

+                                       <p class="error"></p>

+                               </div>

</ins><span class="cx" style="display: block; padding: 0 10px">                         </div>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                </div>

-               </td></tr>

-               </tbody></table></form>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

+                       </td></tr>

+

+               </tbody></table>

+               </form>

</ins><span class="cx" style="display: block; padding: 0 10px">                 <?php

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span></span></pre></div>

<a id="trunksrcwpadminincludesclasswpthemeinstalllisttablephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-theme-install-list-table.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-theme-install-list-table.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/class-wp-theme-install-list-table.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -231,7 +231,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                ?>

</span><span class="cx" style="display: block; padding: 0 10px">                                </div>

</span><span class="cx" style="display: block; padding: 0 10px">                        <?php

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                } // end foreach $theme_names

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         } // End foreach $theme_names.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->theme_installer();

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span></span></pre></div>

<a id="trunksrcwpadminincludesclasswpthemeslisttablephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-themes-list-table.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-themes-list-table.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/class-wp-themes-list-table.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -300,7 +300,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @return bool

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function search_theme( $theme ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Search the features

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Search the features.

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $this->features as $word ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! in_array( $word, $theme->get( 'Tags' ) ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                return false;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -307,7 +307,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">-                // Match all phrases

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Match all phrases.

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $this->search_terms as $word ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( in_array( $word, $theme->get( 'Tags' ) ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                continue;

</span></span></pre></div>

<a id="trunksrcwpadminincludesclasswpupgraderphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-upgrader.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-upgrader.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/class-wp-upgrader.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -195,7 +195,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( is_object( $wp_filesystem ) && $wp_filesystem->errors->has_errors() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $error = $wp_filesystem->errors;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Failed to connect, Error and request again

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Failed to connect. Error and request again.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->skin->request_filesystem_credentials( $error, $directories[0], $allow_relaxed_file_ownership );

</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">@@ -238,7 +238,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">                return true;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        } //end fs_connect();

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Download a package.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -267,8 +267,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        return $reply;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( ! preg_match( '!^(http|https|ftp)://!i', $package ) && file_exists( $package ) ) { //Local file or remote?

-                       return $package; //must be a local file..

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( ! preg_match( '!^(http|https|ftp)://!i', $package ) && file_exists( $package ) ) { // Local file or remote?

+                       return $package; // Must be a local file.

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( empty( $package ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -305,7 +305,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $upgrade_folder = $wp_filesystem->wp_content_dir() . 'upgrade/';

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //Clean up contents of upgrade directory beforehand.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Clean up contents of upgrade directory beforehand.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $upgrade_files = $wp_filesystem->dirlist( $upgrade_folder );

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! empty( $upgrade_files ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        foreach ( $upgrade_files as $file ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -313,15 +313,15 @@

</span><span class="cx" style="display: 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">-                // We need a working directory - Strip off any .tmp or .zip suffixes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // We need a working directory - strip off any .tmp or .zip suffixes.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $working_dir = $upgrade_folder . basename( basename( $package, '.tmp' ), '.zip' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Clean up working directory

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Clean up working directory.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $wp_filesystem->is_dir( $working_dir ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $wp_filesystem->delete( $working_dir, 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">-                // Unzip package to working directory

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Unzip package to working directory.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $result = unzip_file( $package, $working_dir );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Once extracted, delete the package if required.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -356,11 +356,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $nested_files as $name => $details ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $files[ $path . $name ] = $details;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Append children recursively

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Append children recursively.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( ! empty( $details['files'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $children = $this->flatten_dirlist( $details['files'], $path . $name . '/' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Merge keeping possible numeric keys, which array_merge() will reindex from 0..n

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Merge keeping possible numeric keys, which array_merge() will reindex from 0..n.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $files = $files + $children;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -388,7 +388,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        return true;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Flatten the file list to iterate over

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Flatten the file list to iterate over.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $files = $this->flatten_dirlist( $files );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Check all files are writable before attempting to clear the destination.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -450,8 +450,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                global $wp_filesystem, $wp_theme_directories;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $defaults = array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'source'                      => '', // Please always pass this

-                       'destination'                 => '', // and this

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'source'                      => '', // Please always pass this.

+                       'destination'                 => '', // ...and this.

</ins><span class="cx" style="display: block; padding: 0 10px">                         'clear_destination'           => false,

</span><span class="cx" style="display: block; padding: 0 10px">                        'clear_working'               => false,

</span><span class="cx" style="display: block; padding: 0 10px">                        'abort_if_destination_exists' => true,

</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">                        return $res;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //Retain the Original source and destinations

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Retain the original source and destinations.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $remote_source     = $args['source'];

</span><span class="cx" style="display: block; padding: 0 10px">                $local_destination = $destination;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -497,12 +497,16 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $source_files       = array_keys( $wp_filesystem->dirlist( $remote_source ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $remote_destination = $wp_filesystem->find_folder( $local_destination );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //Locate which directory to copy to the new folder, This is based on the actual folder holding the files.

-               if ( 1 == count( $source_files ) && $wp_filesystem->is_dir( trailingslashit( $args['source'] ) . $source_files[0] . '/' ) ) { //Only one folder? Then we want its contents.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Locate which directory to copy to the new folder. This is based on the actual folder holding the files.

+               if ( 1 == count( $source_files ) && $wp_filesystem->is_dir( trailingslashit( $args['source'] ) . $source_files[0] . '/' ) ) {

+                       // Only one folder? Then we want its contents.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $source = trailingslashit( $args['source'] ) . trailingslashit( $source_files[0] );

</span><span class="cx" style="display: block; padding: 0 10px">                } elseif ( count( $source_files ) == 0 ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'incompatible_archive_empty', $this->strings['incompatible_archive'], $this->strings['no_files'] ); // There are no files?

-               } else { // It's only a single file, the upgrader will use the folder name of this file as the destination folder. Folder name is based on zip filename.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // There are no files?

+                       return new WP_Error( 'incompatible_archive_empty', $this->strings['incompatible_archive'], $this->strings['no_files'] );

+               } else {

+                       // It's only a single file, the upgrader will use the folder name of this file as the destination folder.

+                       // Folder name is based on zip filename.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $source = trailingslashit( $args['source'] );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -568,21 +572,22 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                return $removed;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                } elseif ( $args['abort_if_destination_exists'] && $wp_filesystem->exists( $remote_destination ) ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        //If we're not clearing the destination folder and something exists there already, Bail.

-                       //But first check to see if there are actually any files in the folder.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // If we're not clearing the destination folder and something exists there already, bail.

+                       // But first check to see if there are actually any files in the folder.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $_files = $wp_filesystem->dirlist( $remote_destination );

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! empty( $_files ) ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $wp_filesystem->delete( $remote_source, true ); //Clear out the source files.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $wp_filesystem->delete( $remote_source, true ); // Clear out the source files.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 return new WP_Error( 'folder_exists', $this->strings['folder_exists'], $remote_destination );

</span><span class="cx" style="display: 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">-                //Create destination if needed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create destination if needed.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! $wp_filesystem->exists( $remote_destination ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! $wp_filesystem->mkdir( $remote_destination, FS_CHMOD_DIR ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                return new WP_Error( 'mkdir_failed_destination', $this->strings['mkdir_failed'], $remote_destination );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 // Copy new version of item into place.

</span><span class="cx" style="display: block; padding: 0 10px">                $result = copy_dir( $source, $remote_destination );

</span><span class="cx" style="display: block; padding: 0 10px">                if ( is_wp_error( $result ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -592,7 +597,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        return $result;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //Clear the Working folder?

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Clear the working folder?

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $args['clear_working'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $wp_filesystem->delete( $remote_source, true );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -620,7 +625,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        return $res;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //Bombard the calling function will all the info which we've just used.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Bombard the calling function will all the info which we've just used.

</ins><span class="cx" style="display: block; padding: 0 10px">                 return $this->result;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -661,9 +666,9 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $defaults = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'package'                     => '', // Please always pass this.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'destination'                 => '', // And this

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'destination'                 => '', // ...and this.

</ins><span class="cx" style="display: block; padding: 0 10px">                         'clear_destination'           => false,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'abort_if_destination_exists' => true, // Abort if the Destination directory exists, Pass clear_destination as false please

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'abort_if_destination_exists' => true, // Abort if the destination directory exists. Pass clear_destination as false please.

</ins><span class="cx" style="display: block; padding: 0 10px">                         'clear_working'               => true,

</span><span class="cx" style="display: block; padding: 0 10px">                        'is_multi'                    => false,

<span class="cx" style="display: block; padding: 0 10px">                        'hook_extra'                  => array(), // Pass any extra $hook_extra args here, this will be passed to any hooked filters.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -703,11 +708,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                $options = apply_filters( 'upgrader_package_options', $options );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( ! $options['is_multi'] ) { // call $this->header separately if running multiple times

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( ! $options['is_multi'] ) { // Call $this->header separately if running multiple times.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->skin->header();

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Connect to the Filesystem first.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Connect to the filesystem first.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $res = $this->fs_connect( array( WP_CONTENT_DIR, $options['destination'] ) );

<span class="cx" style="display: block; padding: 0 10px">                // Mainly for non-connected filesystem.

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! $res ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -740,7 +745,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                        // Don't output the 'no signature could be found' failure message for now.

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( 'signature_verification_no_signature' != $download->get_error_code() || WP_DEBUG ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Outout the failure error as a normal feedback, and not as an error:

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Output the failure error as a normal feedback, and not as an error.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $this->skin->feedback( $download->get_error_message() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                                // Report this failure back to WordPress.org for debugging purposes.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -765,7 +770,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        return $download;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $delete_package = ( $download != $options['package'] ); // Do not delete a "local" file

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $delete_package = ( $download != $options['package'] ); // Do not delete a "local" file.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Unzips the file into a temporary directory.

</span><span class="cx" style="display: block; padding: 0 10px">                $working_dir = $this->unpack_package( $download, $delete_package );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -857,7 +862,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $file = $wp_filesystem->abspath() . '.maintenance';

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $enable ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->skin->feedback( 'maintenance_start' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Create maintenance file to signal that we are upgrading

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Create maintenance file to signal that we are upgrading.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $maintenance_string = '<?php $upgrading = ' . time() . '; ?>';

</span><span class="cx" style="display: block; padding: 0 10px">                        $wp_filesystem->delete( $file );

</span><span class="cx" style="display: block; padding: 0 10px">                        $wp_filesystem->put_contents( $file, $maintenance_string, FS_CHMOD_FILE );

</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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/class-wp-users-list-table.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -137,7 +137,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                $args = apply_filters( 'users_list_table_query_args', $args );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Query the user IDs for this page

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Query the user IDs for this page.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $wp_user_search = new WP_User_Query( $args );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->items = $wp_user_search->get_results();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -166,7 +166,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * Provides a list of roles and user count for that role for easy

<span class="cx" style="display: block; padding: 0 10px">         * Filtersing of the user table.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since  3.1.0

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @since 3.1.0

</ins><span class="cx" style="display: block; padding: 0 10px">          *

</span><span class="cx" style="display: block; padding: 0 10px">         * @global string $role

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -257,7 +257,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Retrieve an associative array of bulk actions available on this table.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since  3.1.0

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @since 3.1.0

</ins><span class="cx" style="display: block; padding: 0 10px">          *

<span class="cx" style="display: block; padding: 0 10px">         * @return string[] Array of bulk action labels keyed by their action.

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -330,7 +330,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * Overridden from the base class implementation to capture

<span class="cx" style="display: block; padding: 0 10px">         * the role change drop-down.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since  3.1.0

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @since 3.1.0

</ins><span class="cx" style="display: block; padding: 0 10px">          *

<span class="cx" style="display: block; padding: 0 10px">         * @return string The bulk action required.

</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 class="cx" style="display: block; padding: 0 10px">         * Get a list of columns for the list table.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since  3.1.0

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @since 3.1.0

</ins><span class="cx" style="display: block; padding: 0 10px">          *

<span class="cx" style="display: block; padding: 0 10px">         * @return string[] Array of column titles keyed by their column name.

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -389,7 +389,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @since 3.1.0

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function display_rows() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Query the post counts for this page

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Query the post counts for this page.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! $this->is_site_users ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $post_counts = count_many_users_posts( array_keys( $this->items ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -428,7 +428,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $user_roles = $this->get_role_list( $user_object );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set up the hover actions for this user

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set up the hover actions for this user.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $actions     = array();

</span><span class="cx" style="display: block; padding: 0 10px">                $checkbox    = '';

</span><span class="cx" style="display: block; padding: 0 10px">                $super_admin = '';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -439,9 +439,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check if the user for this row is editable

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check if the user for this row is editable.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( current_user_can( 'list_users' ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Set up the user editing link

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Set up the user editing link.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $edit_link = esc_url( add_query_arg( 'wp_http_referer', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ), get_edit_user_link( $user_object->ID ) ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( current_user_can( 'edit_user', $user_object->ID ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -485,7 +485,7 @@

<span class="cx" style="display: block; padding: 0 10px">                        // Role classes.

</span><span class="cx" style="display: block; padding: 0 10px">                        $role_classes = esc_attr( implode( ' ', array_keys( $user_roles ) ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Set up the checkbox ( because the user is editable, otherwise it's empty )

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Set up the checkbox (because the user is editable, otherwise it's empty).

</ins><span class="cx" style="display: block; padding: 0 10px">                         $checkbox = sprintf(

</span><span class="cx" style="display: block; padding: 0 10px">                                '<label class="screen-reader-text" for="user_%1$s">%2$s</label>' .

</span><span class="cx" style="display: block; padding: 0 10px">                                '<input type="checkbox" name="users[]" id="user_%1$s" class="%3$s" value="%1$s" />',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -514,7 +514,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                $classes .= ' has-row-actions column-primary';

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( 'posts' === $column_name ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $classes .= ' num'; // Special case for that column

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $classes .= ' num'; // Special case for that column.

</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 ( in_array( $column_name, $hidden ) ) {

</span></span></pre></div>

<a id="trunksrcwpadminincludescommentphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/comment.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/comment.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/comment.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -79,16 +79,17 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! empty( $_POST['edit_date'] ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $aa                    = $_POST['aa'];

-               $mm                    = $_POST['mm'];

-               $jj                    = $_POST['jj'];

-               $hh                    = $_POST['hh'];

-               $mn                    = $_POST['mn'];

-               $ss                    = $_POST['ss'];

-               $jj                    = ( $jj > 31 ) ? 31 : $jj;

-               $hh                    = ( $hh > 23 ) ? $hh - 24 : $hh;

-               $mn                    = ( $mn > 59 ) ? $mn - 60 : $mn;

-               $ss                    = ( $ss > 59 ) ? $ss - 60 : $ss;

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $aa = $_POST['aa'];

+               $mm = $_POST['mm'];

+               $jj = $_POST['jj'];

+               $hh = $_POST['hh'];

+               $mn = $_POST['mn'];

+               $ss = $_POST['ss'];

+               $jj = ( $jj > 31 ) ? 31 : $jj;

+               $hh = ( $hh > 23 ) ? $hh - 24 : $hh;

+               $mn = ( $mn > 59 ) ? $mn - 60 : $mn;

+               $ss = ( $ss > 59 ) ? $ss - 60 : $ss;

+

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_POST['comment_date'] = "$aa-$mm-$jj $hh:$mn:$ss";

</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="trunksrcwpadminincludescreditsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/credits.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/credits.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/credits.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,7 +15,7 @@

<span class="cx" style="display: block; padding: 0 10px">  * @return array|false A list of all of the contributors, or false on error.

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function wp_credits() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // include an unmodified $wp_version

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Include an unmodified $wp_version.

</ins><span class="cx" style="display: block; padding: 0 10px">         include( ABSPATH . WPINC . '/version.php' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $locale = get_user_locale();

</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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/dashboard.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -263,7 +263,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> //

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Dashboard Widgets

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Dashboard Widgets.

</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">@@ -1116,7 +1116,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">-// Dashboard Widgets Controls

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Dashboard Widgets Controls.

</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">@@ -1627,7 +1627,7 @@

<span class="cx" style="display: block; padding: 0 10px">         * @param string $notice   The notice content.

<span class="cx" style="display: block; padding: 0 10px">         * @param array  $response An array containing web browser information. See `wp_check_browser_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">-        echo apply_filters( 'browse-happy-notice', $notice, $response );  // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo apply_filters( 'browse-happy-notice', $notice, $response ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores

</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="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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/file.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1214,7 +1214,7 @@

<span class="cx" style="display: block; padding: 0 10px">        // Check for a edge-case affecting PHP Maths abilities.

</span><span class="cx" style="display: block; padding: 0 10px">        if (

</span><span class="cx" style="display: block; padding: 0 10px">                ! extension_loaded( 'sodium' ) &&

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                in_array( PHP_VERSION_ID, [ 70200, 70201, 70202 ], true ) &&

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         in_array( PHP_VERSION_ID, array( 70200, 70201, 70202 ), true ) &&

</ins><span class="cx" style="display: block; padding: 0 10px">                 extension_loaded( 'opcache' )

</span><span class="cx" style="display: block; padding: 0 10px">        ) {

<span class="cx" style="display: block; padding: 0 10px">                // Sodium_Compat isn't compatible with PHP 7.2.0~7.2.2 due to a bug in the PHP Opcache extension, bail early as it'll fail.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1546,7 +1546,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        return new WP_Error( 'stat_failed_ziparchive', __( 'Could not retrieve file from archive.' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( '/' == substr( $info['name'], -1 ) ) { // directory

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( '/' == substr( $info['name'], -1 ) ) { // Directory.

</ins><span class="cx" style="display: block; padding: 0 10px">                         continue;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunksrcwpadminincludesimagephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/image.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/image.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/image.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -272,8 +272,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                $threshold = (int) apply_filters( 'big_image_size_threshold', 2560, $imagesize, $file, $attachment_id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If the original image's dimensions are over the threshold, scale the image

-               // and use it as the "full" size.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If the original image's dimensions are over the threshold,

+               // scale the image and use it as the "full" size.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $threshold && ( $image_meta['width'] > $threshold || $image_meta['height'] > $threshold ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $editor = wp_get_image_editor( $file );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -282,7 +282,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                return $image_meta;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Resize the image

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Resize the image.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $resized = $editor->resize( $threshold, $threshold );

</span><span class="cx" style="display: block; padding: 0 10px">                        $rotated = null;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -305,10 +305,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                                $image_meta['image_meta']['orientation'] = 1;

</span><span class="cx" style="display: block; padding: 0 10px">                                        }

</span><span class="cx" style="display: block; padding: 0 10px">                                } else {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // TODO: log errors.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // TODO: Log errors.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 }

</span><span class="cx" style="display: block; padding: 0 10px">                        } else {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // TODO: log errors.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // TODO: Log errors.

</ins><span class="cx" style="display: block; padding: 0 10px">                         }

</span><span class="cx" style="display: block; padding: 0 10px">                } elseif ( ! empty( $exif_meta['orientation'] ) && (int) $exif_meta['orientation'] !== 1 ) {

<span class="cx" style="display: block; padding: 0 10px">                        // Rotate the whole original image if there is EXIF data and "orientation" is not 1.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -335,7 +335,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                                $image_meta['image_meta']['orientation'] = 1;

</span><span class="cx" style="display: block; padding: 0 10px">                                        }

</span><span class="cx" style="display: block; padding: 0 10px">                                } else {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // TODO: log errors.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // TODO: Log errors.

</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">@@ -434,7 +434,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $rotated = $editor->maybe_exif_rotate();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( is_wp_error( $rotated ) ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // TODO: log errors.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // TODO: Log errors.

</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">@@ -443,7 +443,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $new_size_meta = $editor->make_subsize( $new_size_data );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( is_wp_error( $new_size_meta ) ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // TODO: log errors.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // TODO: Log errors.

</ins><span class="cx" style="display: block; padding: 0 10px">                         } else {

<span class="cx" style="display: block; padding: 0 10px">                                // Save the size meta value.

</span><span class="cx" style="display: block; padding: 0 10px">                                $image_meta['sizes'][ $new_size_name ] = $new_size_meta;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -575,7 +575,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! empty( $merged_sizes ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $editor = wp_get_image_editor( $file );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( ! is_wp_error( $editor ) ) { // No support for this type of file

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 if ( ! is_wp_error( $editor ) ) { // No support for this type of file.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 /*

<span class="cx" style="display: block; padding: 0 10px">                                 * PDFs may have the same file filename as JPEGs.

<span class="cx" style="display: block; padding: 0 10px">                                 * Ensure the PDF preview image does not overwrite any JPEG images that already exist.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -715,18 +715,18 @@

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! empty( $info['APP13'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $iptc = @iptcparse( $info['APP13'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Headline, "A brief synopsis of the caption."

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Headline, "A brief synopsis of the caption".

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( ! empty( $iptc['2#105'][0] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $meta['title'] = trim( $iptc['2#105'][0] );

</span><span class="cx" style="display: block; padding: 0 10px">                                /*

</span><span class="cx" style="display: block; padding: 0 10px">                                * Title, "Many use the Title field to store the filename of the image,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                * though the field may be used in many ways."

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         * though the field may be used in many ways".

</ins><span class="cx" style="display: block; padding: 0 10px">                                 */

</span><span class="cx" style="display: block; padding: 0 10px">                        } elseif ( ! empty( $iptc['2#005'][0] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $meta['title'] = trim( $iptc['2#005'][0] );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( ! empty( $iptc['2#120'][0] ) ) { // description / legacy caption

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 if ( ! empty( $iptc['2#120'][0] ) ) { // Description / legacy caption.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $caption = trim( $iptc['2#120'][0] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                mbstring_binary_safe_encoding();

</span></span></pre></div>

<a id="trunksrcwpadminincludesimportphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/import.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/import.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/import.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -136,7 +136,8 @@

<span class="cx" style="display: block; padding: 0 10px">  * @return array Importers with metadata for each.

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function wp_get_popular_importers() {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        include( ABSPATH . WPINC . '/version.php' ); // Include an unmodified $wp_version.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Include an unmodified $wp_version.

+       include( ABSPATH . WPINC . '/version.php' );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $locale            = get_user_locale();

</span><span class="cx" style="display: block; padding: 0 10px">        $cache_key         = 'popular_importers_' . md5( $locale . $wp_version );

</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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/media.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -770,7 +770,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( $image_alt != get_post_meta( $attachment_id, '_wp_attachment_image_alt', true ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        $image_alt = wp_strip_all_tags( $image_alt, true );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Update_meta expects slashed.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // update_post_meta() expects slashed.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         update_post_meta( $attachment_id, '_wp_attachment_image_alt', wp_slash( $image_alt ) );

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2529,7 +2529,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        </div>

</span><span class="cx" style="display: block; padding: 0 10px">        <form enctype="multipart/form-data" method="post" action="<?php echo esc_url( $form_action_url ); ?>" class="<?php echo $form_class; ?>" id="gallery-form">

</span><span class="cx" style="display: block; padding: 0 10px">                <?php wp_nonce_field( 'media-form' ); ?>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <?php //media_upload_form( $errors ); ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <?php // media_upload_form( $errors ); ?>

</ins><span class="cx" style="display: block; padding: 0 10px">         <table class="widefat">

</span><span class="cx" style="display: block; padding: 0 10px">        <thead><tr>

</span><span class="cx" style="display: block; padding: 0 10px">        <th><?php _e( 'Media' ); ?></th>

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2831,7 +2831,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        <form enctype="multipart/form-data" method="post" action="<?php echo esc_url( $form_action_url ); ?>" class="<?php echo $form_class; ?>" id="library-form">

</span><span class="cx" style="display: block; padding: 0 10px">        <?php wp_nonce_field( 'media-form' ); ?>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        <?php //media_upload_form( $errors ); ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php // media_upload_form( $errors ); ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        <script type="text/javascript">

</span><span class="cx" style="display: block; padding: 0 10px">        jQuery(function($){

</span></span></pre></div>

<a id="trunksrcwpadminincludesprivacytoolsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/privacy-tools.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/privacy-tools.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/privacy-tools.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -321,7 +321,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">        $stripped_email       = str_replace( '@', '-at-', $email_address );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $stripped_email       = sanitize_title( $stripped_email ); // slugify the email address

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $stripped_email       = sanitize_title( $stripped_email ); // Slugify the email address.

</ins><span class="cx" style="display: block; padding: 0 10px">         $obscura              = wp_generate_password( 32, false, false );

</span><span class="cx" style="display: block; padding: 0 10px">        $file_basename        = 'wp-personal-data-file-' . $stripped_email . '-' . $obscura;

</span><span class="cx" style="display: block; padding: 0 10px">        $html_report_filename = $file_basename . '.html';

</span></span></pre></div>

<a id="trunksrcwpadminincludesrevisionphp"></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/revision.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/revision.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/revision.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -55,7 +55,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $compare_to   = $temp;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Add default title if title field is empty

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Add default title if title field is empty.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( $compare_from && empty( $compare_from->post_title ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $compare_from->post_title = __( '(no title)' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -340,7 +340,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                'from'           => $from,

</span><span class="cx" style="display: block; padding: 0 10px">                'diffData'       => $diffs,

</span><span class="cx" style="display: block; padding: 0 10px">                'baseUrl'        => parse_url( admin_url( 'revision.php' ), PHP_URL_PATH ),

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                'compareTwoMode' => absint( $compare_two_mode ), // Apparently booleans are not allowed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         'compareTwoMode' => absint( $compare_two_mode ), // Apparently booleans are not allowed.

</ins><span class="cx" style="display: block; padding: 0 10px">                 'revisionIds'    => array_keys( $revisions ),

</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="trunksrcwpadminincludesschemaphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/schema.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/schema.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/schema.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,7 +52,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        $max_index_length = 191;

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Blog specific tables.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Blog-specific tables.

</ins><span class="cx" style="display: block; padding: 0 10px">         $blog_tables = "CREATE TABLE $wpdb->termmeta (

</span><span class="cx" style="display: block; padding: 0 10px">        meta_id bigint(20) unsigned NOT NULL auto_increment,

</span><span class="cx" style="display: block; padding: 0 10px">        term_id bigint(20) unsigned NOT NULL default '0',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -205,7 +205,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        KEY user_email (user_email)

</span><span class="cx" style="display: block; padding: 0 10px"> ) $charset_collate;\n";

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Multisite users table

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Multisite users table.

</ins><span class="cx" style="display: block; padding: 0 10px">         $users_multi_table = "CREATE TABLE $wpdb->users (

</span><span class="cx" style="display: block; padding: 0 10px">        ID bigint(20) unsigned NOT NULL auto_increment,

</span><span class="cx" style="display: block; padding: 0 10px">        user_login varchar(60) NOT NULL default '',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -236,7 +236,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        KEY meta_key (meta_key($max_index_length))

</span><span class="cx" style="display: block; padding: 0 10px"> ) $charset_collate;\n";

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Global tables

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Global tables.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( $is_multisite ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $global_tables = $users_multi_table . $usermeta_table;

</span><span class="cx" style="display: block; padding: 0 10px">        } else {

</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">                        ? $wp_current_db_version : $wp_db_version;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // 3.0 multisite

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // 3.0 multisite.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( is_multisite() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                /* translators: %s: Network title. */

</span><span class="cx" style="display: block; padding: 0 10px">                $defaults['blogdescription']     = sprintf( __( 'Just another %s site' ), get_network()->site_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">        $options = wp_parse_args( $options, $defaults );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Set autoload to no for these options

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Set autoload to no for these options.

</ins><span class="cx" style="display: block; padding: 0 10px">         $fat_options = array( 'moderation_keys', 'recently_edited', 'blacklist_keys', 'uninstall_plugins' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $keys             = "'" . implode( "', '", array_keys( $options ) ) . "'";

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -677,7 +677,7 @@

<span class="cx" style="display: block; padding: 0 10px">        // Delete obsolete magpie stuff.

</span><span class="cx" style="display: block; padding: 0 10px">        $wpdb->query( "DELETE FROM $wpdb->options WHERE option_name REGEXP '^rss_[0-9a-f]{32}(_ts)?$'" );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Clear expired transients

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Clear expired transients.

</ins><span class="cx" style="display: block; padding: 0 10px">         delete_expired_transients( 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">@@ -703,8 +703,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">  * @since 2.0.0

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function populate_roles_160() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Add roles

-

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Add roles.

</ins><span class="cx" style="display: block; padding: 0 10px">         add_role( 'administrator', 'Administrator' );

</span><span class="cx" style="display: block; padding: 0 10px">        add_role( 'editor', 'Editor' );

</span><span class="cx" style="display: block; padding: 0 10px">        add_role( 'author', 'Author' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -711,7 +710,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        add_role( 'contributor', 'Contributor' );

</span><span class="cx" style="display: block; padding: 0 10px">        add_role( 'subscriber', 'Subscriber' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Add caps for Administrator role

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Add caps for Administrator role.

</ins><span class="cx" style="display: block; padding: 0 10px">         $role = get_role( 'administrator' );

</span><span class="cx" style="display: block; padding: 0 10px">        $role->add_cap( 'switch_themes' );

</span><span class="cx" style="display: block; padding: 0 10px">        $role->add_cap( 'edit_themes' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -744,7 +743,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $role->add_cap( 'level_1' );

</span><span class="cx" style="display: block; padding: 0 10px">        $role->add_cap( 'level_0' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Add caps for Editor role

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Add caps for Editor role.

</ins><span class="cx" style="display: block; padding: 0 10px">         $role = get_role( 'editor' );

</span><span class="cx" style="display: block; padding: 0 10px">        $role->add_cap( 'moderate_comments' );

</span><span class="cx" style="display: block; padding: 0 10px">        $role->add_cap( 'manage_categories' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -766,7 +765,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $role->add_cap( 'level_1' );

</span><span class="cx" style="display: block; padding: 0 10px">        $role->add_cap( 'level_0' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Add caps for Author role

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Add caps for Author role.

</ins><span class="cx" style="display: block; padding: 0 10px">         $role = get_role( 'author' );

</span><span class="cx" style="display: block; padding: 0 10px">        $role->add_cap( 'upload_files' );

</span><span class="cx" style="display: block; padding: 0 10px">        $role->add_cap( 'edit_posts' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -777,7 +776,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $role->add_cap( 'level_1' );

</span><span class="cx" style="display: block; padding: 0 10px">        $role->add_cap( 'level_0' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Add caps for Contributor role

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Add caps for Contributor role.

</ins><span class="cx" style="display: block; padding: 0 10px">         $role = get_role( 'contributor' );

</span><span class="cx" style="display: block; padding: 0 10px">        $role->add_cap( 'edit_posts' );

</span><span class="cx" style="display: block; padding: 0 10px">        $role->add_cap( 'read' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -784,7 +783,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $role->add_cap( 'level_1' );

</span><span class="cx" style="display: block; padding: 0 10px">        $role->add_cap( 'level_0' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Add caps for Subscriber role

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Add caps for Subscriber role.

</ins><span class="cx" style="display: block; padding: 0 10px">         $role = get_role( 'subscriber' );

</span><span class="cx" style="display: block; padding: 0 10px">        $role->add_cap( 'read' );

</span><span class="cx" style="display: block; padding: 0 10px">        $role->add_cap( 'level_0' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1244,7 +1243,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                'welcome_email'               => $welcome_email,

</span><span class="cx" style="display: block; padding: 0 10px">                /* translators: %s: Site link. */

</span><span class="cx" style="display: block; padding: 0 10px">                'first_post'                  => __( 'Welcome to %s. This is your first post. Edit or delete it, then start writing!' ),

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // @todo - network admins should have a method of editing the network siteurl (used for cookie hash)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // @todo - Network admins should have a method of editing the network siteurl (used for cookie hash).

</ins><span class="cx" style="display: block; padding: 0 10px">                 'siteurl'                     => get_option( 'siteurl' ) . '/',

</span><span class="cx" style="display: block; padding: 0 10px">                'add_new_users'               => '0',

</span><span class="cx" style="display: block; padding: 0 10px">                'upload_space_check_disabled' => is_multisite() ? get_site_option( 'upload_space_check_disabled' ) : '1',

</span></span></pre></div>

<a id="trunksrcwpadminincludesscreenphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/screen.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/screen.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/screen.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -117,7 +117,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( false == $box || ! $box['title'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        continue;

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Submit box cannot be hidden

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Submit box cannot be hidden.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( 'submitdiv' == $box['id'] || 'linksubmitdiv' == $box['id'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        continue;

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -156,7 +156,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $use_defaults = ! is_array( $hidden );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Hide slug boxes by default

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Hide slug boxes by default.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( $use_defaults ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $hidden = array();

</span><span class="cx" style="display: block; padding: 0 10px">                if ( 'post' == $screen->base ) {

</span></span></pre></div>

<a id="trunksrcwpadminincludestaxonomyphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/taxonomy.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/taxonomy.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/taxonomy.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,7 +7,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> //

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Category

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// 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"> /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -192,7 +192,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                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">-        // First, get all of the original fields

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // First, get all of the original fields.

</ins><span class="cx" style="display: block; padding: 0 10px">         $category = get_term( $cat_ID, 'category', ARRAY_A );

</span><span class="cx" style="display: block; padding: 0 10px">        _make_cat_compat( $category );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -206,7 +206,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">-// Tags

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Tags.

</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="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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/template.php    2020-01-29 00:43:23 UTC (rev 47122)

</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"> require_once( ABSPATH . 'wp-admin/includes/class-wp-internal-pointers.php' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> //

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Category Checklists

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Category Checklists.

</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">@@ -165,7 +165,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $output = '';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( $parsed_args['checked_ontop'] ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Post process $categories rather than adding an exclude to the get_terms() query to keep the query the same across all posts (for any query cache)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Post-process $categories rather than adding an exclude to the get_terms() query

+               // to keep the query the same across all posts (for any query cache).

</ins><span class="cx" style="display: block; padding: 0 10px">                 $checked_categories = array();

</span><span class="cx" style="display: block; padding: 0 10px">                $keys               = array_keys( $categories );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -176,10 +177,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Put checked cats on top

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Put checked categories on top.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $output .= $walker->walk( $checked_categories, 0, $args );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Then the rest of them

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Then the rest of them.

</ins><span class="cx" style="display: block; padding: 0 10px">         $output .= $walker->walk( $categories, 0, $args );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( $parsed_args['echo'] ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -265,7 +266,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( $link_id ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $checked_categories = wp_get_link_cats( $link_id );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // No selected categories, strange

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // No selected categories, strange.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! count( $checked_categories ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $checked_categories[] = $default;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -559,7 +560,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">  * @param array $meta

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function list_meta( $meta ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Exit if no meta

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Exit if no meta.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! $meta ) {

</span><span class="cx" style="display: block; padding: 0 10px">                echo '

</span><span class="cx" style="display: block; padding: 0 10px"> <table id="list-table" style="display: none;">

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -572,7 +573,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        <tbody id="the-list" data-wp-lists="list:meta">

</span><span class="cx" style="display: block; padding: 0 10px">        <tr><td></td></tr>

</span><span class="cx" style="display: block; padding: 0 10px">        </tbody>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-</table>'; //TBODY needed for list-manipulation JS

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+</table>'; // TBODY needed for list-manipulation JS.

</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">        $count = 0;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -632,7 +633,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">        $entry['meta_key']   = esc_attr( $entry['meta_key'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $entry['meta_value'] = esc_textarea( $entry['meta_value'] ); // using a <textarea />

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $entry['meta_value'] = esc_textarea( $entry['meta_value'] ); // Using a <textarea />.

</ins><span class="cx" style="display: block; padding: 0 10px">         $entry['meta_id']    = (int) $entry['meta_id'];

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $delete_nonce = wp_create_nonce( 'delete-meta_' . $entry['meta_id'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -790,7 +791,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $tab_index_attribute = " tabindex=\"$tab_index\"";

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // todo: Remove this?

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // @todo Remove this?

</ins><span class="cx" style="display: block; padding: 0 10px">         // echo '<label for="timestamp" style="display: block;"><input type="checkbox" class="checkbox" name="edit_date" value="1" id="timestamp"'.$tab_index_attribute.' /> '.__( 'Edit timestamp' ).'</label><br />';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $post_date = ( $for_post ) ? $post->post_date : get_comment()->comment_date;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -925,7 +926,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        foreach ( $editable_roles as $role => $details ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $name = translate_user_role( $details['name'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // preselect specified role

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Preselect specified role.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $selected == $role ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $r .= "\n\t<option selected='selected' value='" . esc_attr( $role ) . "'>$name</option>";

</span><span class="cx" style="display: block; padding: 0 10px">                } else {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1052,7 +1053,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                        // If a core box was previously added or removed by a plugin, don't add.

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( 'core' == $priority ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // If core box previously deleted, don't add

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // If core box previously deleted, don't add.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( false === $wp_meta_boxes[ $page ][ $a_context ][ $a_priority ][ $id ] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        return;

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1067,7 +1068,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px">                                return;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // If no priority given and id already present, use existing priority.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // If no priority given and ID already present, use existing priority.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( empty( $priority ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $priority = $a_priority;

</span><span class="cx" style="display: block; padding: 0 10px">                                /*

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1079,7 +1080,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                $callback      = $wp_meta_boxes[ $page ][ $a_context ][ $a_priority ][ $id ]['callback'];

</span><span class="cx" style="display: block; padding: 0 10px">                                $callback_args = $wp_meta_boxes[ $page ][ $a_context ][ $a_priority ][ $id ]['args'];

</span><span class="cx" style="display: block; padding: 0 10px">                        }

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // An id can be in only one priority and one context.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // An ID can be in only one priority and one context.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( $priority != $a_priority || $context != $a_context ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                unset( $wp_meta_boxes[ $page ][ $a_context ][ $a_priority ][ $id ] );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1245,7 +1246,8 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        printf( '<div id="%s-sortables" class="meta-box-sortables">', esc_attr( $context ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Grab the ones the user has manually sorted. Pull them out of their previous context/priority and into the one the user chose

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Grab the ones the user has manually sorted.

+       // Pull them out of their previous context/priority and into the one the user chose.

</ins><span class="cx" style="display: block; padding: 0 10px">         $sorted = get_user_option( "meta-box-order_$page" );

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! $already_sorted && $sorted ) {

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $sorted as $box_context => $ids ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2192,12 +2194,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                } else {

</span><span class="cx" style="display: block; padding: 0 10px">                        $header_image = get_header_image();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Display "Header Image" if the image was ever used as a header image

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Display "Header Image" if the image was ever used as a header image.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( ! empty( $meta_header ) && $meta_header == $stylesheet && $header_image !== wp_get_attachment_url( $post->ID ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $media_states[] = __( 'Header Image' );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Display "Current Header Image" if the image is currently the header image

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Display "Current Header Image" if the image is currently the header image.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( $header_image && $header_image == wp_get_attachment_url( $post->ID ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $media_states[] = __( 'Current Header Image' );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2378,7 +2380,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $text = $text ? $text : __( 'Save Changes' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Default the id attribute to $name unless an id was specifically provided in $other_attributes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Default the id attribute to $name unless an id was specifically provided in $other_attributes.

</ins><span class="cx" style="display: block; padding: 0 10px">         $id = $name;

</span><span class="cx" style="display: block; padding: 0 10px">        if ( is_array( $other_attributes ) && isset( $other_attributes['id'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $id = $other_attributes['id'];

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2388,9 +2390,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $attributes = '';

</span><span class="cx" style="display: block; padding: 0 10px">        if ( is_array( $other_attributes ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $other_attributes as $attribute => $value ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $attributes .= $attribute . '="' . esc_attr( $value ) . '" '; // Trailing space is important

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $attributes .= $attribute . '="' . esc_attr( $value ) . '" '; // Trailing space is important.

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        } elseif ( ! empty( $other_attributes ) ) { // Attributes provided as a string

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ! empty( $other_attributes ) ) { // Attributes provided as a string.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $attributes = $other_attributes;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2533,15 +2535,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">        );

</span><span class="cx" style="display: block; padding: 0 10px">        $parsed_args = wp_parse_args( $args, $defaults );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Non-English decimal places when the $rating is coming from a string

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Non-English decimal places when the $rating is coming from a string.

</ins><span class="cx" style="display: block; padding: 0 10px">         $rating = (float) str_replace( ',', '.', $parsed_args['rating'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Convert Percentage to star rating, 0..5 in .5 increments

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Convert percentage to star rating, 0..5 in .5 increments.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( 'percent' === $parsed_args['type'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $rating = round( $rating / 10, 0 ) / 2;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Calculate the number of each type of star needed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Calculate the number of each type of star needed.

</ins><span class="cx" style="display: block; padding: 0 10px">         $full_stars  = floor( $rating );

</span><span class="cx" style="display: block; padding: 0 10px">        $half_stars  = ceil( $rating - $full_stars );

</span><span class="cx" style="display: block; padding: 0 10px">        $empty_stars = 5 - $full_stars - $half_stars;

</span></span></pre></div>

<a id="trunksrcwpadminincludesthemephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/theme.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/theme.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/theme.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -45,7 +45,8 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! WP_Filesystem( $credentials ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                ob_start();

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                request_filesystem_credentials( $redirect, '', true ); // Failed to connect, Error and request again.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Failed to connect. Error and request again.

+               request_filesystem_credentials( $redirect, '', true );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $data = ob_get_clean();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! empty( $data ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -194,7 +195,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'height'    => 800,

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                        $update['url']

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                ); //Theme browser inside WP? replace this, Also, theme preview JS will override this on the available list.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         ); // Theme browser inside WP? Replace this. Also, theme preview JS will override this on the available list.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $update_url  = wp_nonce_url( admin_url( 'update.php?action=upgrade-theme&amp;theme=' . urlencode( $stylesheet ) ), 'upgrade-theme_' . $stylesheet );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! is_multisite() ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -260,7 +261,7 @@

<span class="cx" style="display: block; padding: 0 10px">  * @return array Array of features keyed by category with translations keyed by slug.

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function get_theme_feature_list( $api = true ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Hard-coded list is used if api not accessible.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Hard-coded list is used if API is not accessible.

</ins><span class="cx" style="display: block; padding: 0 10px">         $features = array(

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                __( 'Subject' )  => array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -331,7 +332,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                'Subject'  => __( 'Subject' ),

</span><span class="cx" style="display: block; padding: 0 10px">        );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Loop over the wporg canonical list and apply translations

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Loop over the wp.org canonical list and apply translations.

</ins><span class="cx" style="display: block; padding: 0 10px">         $wporg_features = array();

</span><span class="cx" style="display: block; padding: 0 10px">        foreach ( (array) $feature_list as $feature_category => $feature_items ) {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( isset( $category_translations[ $feature_category ] ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -433,7 +434,7 @@

<span class="cx" style="display: block; padding: 0 10px">  *         for more information on the make-up of possible return objects depending on the value of `$action`.

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function themes_api( $action, $args = array() ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // include an unmodified $wp_version

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Include an unmodified $wp_version.

</ins><span class="cx" style="display: block; padding: 0 10px">         include( ABSPATH . WPINC . '/version.php' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( is_array( $args ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -451,7 +452,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! isset( $args->wp_version ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $args->wp_version = substr( $wp_version, 0, 3 ); // X.y

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $args->wp_version = substr( $wp_version, 0, 3 ); // x.y

</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">@@ -655,7 +656,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $prepared_themes[ $slug ] = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'id'           => $slug,

</span><span class="cx" style="display: block; padding: 0 10px">                        'name'         => $theme->display( 'Name' ),

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'screenshot'   => array( $theme->get_screenshot() ), // @todo multiple

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'screenshot'   => array( $theme->get_screenshot() ), // @todo Multiple screenshots.

</ins><span class="cx" style="display: block; padding: 0 10px">                         'description'  => $theme->display( 'Description' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        'author'       => $theme->display( 'Author', false, true ),

</span><span class="cx" style="display: block; padding: 0 10px">                        'authorAndUri' => $theme->display( 'Author' ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -674,7 +675,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">-        // Remove 'delete' action if theme has an active child

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Remove 'delete' action if theme has an active child.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! empty( $parents ) && array_key_exists( $current_theme, $parents ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                unset( $prepared_themes[ $parents[ $current_theme ] ]['actions']['delete'] );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span></span></pre></div>

<a id="trunksrcwpadminincludestranslationinstallphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/translation-install.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/translation-install.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/translation-install.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,7 +17,8 @@

<span class="cx" style="display: block; padding: 0 10px">  * @return object|WP_Error On success an object of translations, WP_Error on failure.

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function translations_api( $type, $args = null ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        include( ABSPATH . WPINC . '/version.php' ); // include an unmodified $wp_version

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Include an unmodified $wp_version.

+       include( ABSPATH . WPINC . '/version.php' );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! in_array( $type, array( 'plugins', 'themes', 'core' ) ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                return  new WP_Error( 'invalid_type', __( 'Invalid translation type.' ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -47,12 +48,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'body'    => array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'wp_version' => $wp_version,

</span><span class="cx" style="display: block; padding: 0 10px">                                'locale'     => get_locale(),

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                'version'    => $args['version'], // Version of plugin, theme or core

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         'version'    => $args['version'], // Version of plugin, theme or core.

</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="cx" style="display: block; padding: 0 10px">                if ( 'core' !== $type ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $options['body']['slug'] = $args['slug']; // Plugin or theme slug

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $options['body']['slug'] = $args['slug']; // Plugin or theme slug.

</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">                $request = wp_remote_post( $url, $options );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -126,7 +127,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        include( ABSPATH . WPINC . '/version.php' ); // include an unmodified $wp_version

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Include an unmodified $wp_version.

+       include( ABSPATH . WPINC . '/version.php' );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $api = translations_api( 'core', array( 'version' => $wp_version ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunksrcwpadminincludesupdatecorephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/update-core.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/update-core.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/update-core.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -253,7 +253,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        'wp-includes/js/jquery/autocomplete.js',

</span><span class="cx" style="display: block; padding: 0 10px">        'wp-includes/js/jquery/interface.js',

</span><span class="cx" style="display: block; padding: 0 10px">        'wp-includes/js/scriptaculous/prototype.js',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Following file added back in 5.1 see #45645

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Following file added back in 5.1, see #45645.

</ins><span class="cx" style="display: block; padding: 0 10px">         //'wp-includes/js/tinymce/wp-tinymce.js',

</span><span class="cx" style="display: block; padding: 0 10px">        // 3.1

</span><span class="cx" style="display: block; padding: 0 10px">        'wp-admin/edit-attachment-rows.php',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -536,7 +536,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        'wp-admin/images/screenshots/twitter-embed-1.png',

</span><span class="cx" style="display: block; padding: 0 10px">        'wp-admin/images/screenshots/twitter-embed-2.png',

</span><span class="cx" style="display: block; padding: 0 10px">        'wp-admin/js/utils.js',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Added back in 5.3 [45448], see #43895

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Added back in 5.3 [45448], see #43895.

</ins><span class="cx" style="display: block; padding: 0 10px">         // 'wp-admin/options-privacy.php',

</span><span class="cx" style="display: block; padding: 0 10px">        'wp-app.php',

</span><span class="cx" style="display: block; padding: 0 10px">        'wp-includes/class-wp-atom-server.php',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -600,7 +600,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        'wp-admin/css/colors.min.css',

</span><span class="cx" style="display: block; padding: 0 10px">        'wp-admin/css/colors-rtl.css',

</span><span class="cx" style="display: block; padding: 0 10px">        'wp-admin/css/colors-rtl.min.css',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Following files added back in 4.5 see #36083

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Following files added back in 4.5, see #36083.

</ins><span class="cx" style="display: block; padding: 0 10px">         // 'wp-admin/css/media-rtl.min.css',

</span><span class="cx" style="display: block; padding: 0 10px">        // 'wp-admin/css/media.min.css',

</span><span class="cx" style="display: block; padding: 0 10px">        // 'wp-admin/css/farbtastic-rtl.min.css',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -615,7 +615,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        'wp-includes/js/plupload/changelog.txt',

</span><span class="cx" style="display: block; padding: 0 10px">        'wp-includes/js/plupload/plupload.silverlight.js',

</span><span class="cx" style="display: block; padding: 0 10px">        'wp-includes/js/plupload/plupload.flash.js',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Added back in 4.9 [41328], see #41755

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Added back in 4.9 [41328], see #41755.

</ins><span class="cx" style="display: block; padding: 0 10px">         // 'wp-includes/js/plupload/plupload.js',

</span><span class="cx" style="display: block; padding: 0 10px">        'wp-includes/js/tinymce/plugins/spellchecker',

</span><span class="cx" style="display: block; padding: 0 10px">        'wp-includes/js/tinymce/plugins/inlinepopups',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -787,7 +787,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        'wp-includes/random_compat/random_bytes_openssl.php',

</span><span class="cx" style="display: block; padding: 0 10px">        'wp-includes/js/tinymce/wp-tinymce.js.gz',

</span><span class="cx" style="display: block; padding: 0 10px">        // 5.3

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        'wp-includes/js/wp-a11y.js', // Moved to: wp-includes/js/dist/a11y.js

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wp-includes/js/wp-a11y.js',     // Moved to: wp-includes/js/dist/a11y.js

</ins><span class="cx" style="display: block; padding: 0 10px">         'wp-includes/js/wp-a11y.min.js', // Moved to: wp-includes/js/dist/a11y.min.js

</span><span class="cx" style="display: block; padding: 0 10px"> );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -938,8 +938,8 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $php_version       = phpversion();

</span><span class="cx" style="display: block; padding: 0 10px">        $mysql_version     = $wpdb->db_version();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $old_wp_version    = $GLOBALS['wp_version']; // The version of WordPress we're updating from

-       $development_build = ( false !== strpos( $old_wp_version . $wp_version, '-' ) ); // a dash in the version indicates a Development release

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $old_wp_version    = $GLOBALS['wp_version']; // The version of WordPress we're updating from.

+       $development_build = ( false !== strpos( $old_wp_version . $wp_version, '-' ) ); // A dash in the version indicates a development release.

</ins><span class="cx" style="display: block; padding: 0 10px">         $php_compat        = version_compare( $php_version, $required_php_version, '>=' );

</span><span class="cx" style="display: block; padding: 0 10px">        if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $mysql_compat = true;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1017,19 +1017,19 @@

</span><span class="cx" style="display: block; padding: 0 10px">        /** This filter is documented in wp-admin/includes/update-core.php */

</span><span class="cx" style="display: block; padding: 0 10px">        apply_filters( 'update_feedback', __( 'Preparing to install the latest version&#8230;' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Don't copy wp-content, we'll deal with that below

-       // We also copy version.php last so failed updates report their old version

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Don't copy wp-content, we'll deal with that below.

+       // We also copy version.php last so failed updates report their old version.

</ins><span class="cx" style="display: block; padding: 0 10px">         $skip              = array( 'wp-content', 'wp-includes/version.php' );

</span><span class="cx" style="display: block; padding: 0 10px">        $check_is_writable = array();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Check to see which files don't really need updating - only available for 3.7 and higher

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Check to see which files don't really need updating - only available for 3.7 and higher.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( function_exists( 'get_core_checksums' ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Find the local version of the working directory

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Find the local version of the working directory.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $working_dir_local = WP_CONTENT_DIR . '/upgrade/' . basename( $from ) . $distro;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $checksums = get_core_checksums( $wp_version, isset( $wp_local_package ) ? $wp_local_package : 'en_US' );

</span><span class="cx" style="display: block; padding: 0 10px">                if ( is_array( $checksums ) && isset( $checksums[ $wp_version ] ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $checksums = $checksums[ $wp_version ]; // Compat code for 3.7-beta2

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $checksums = $checksums[ $wp_version ]; // Compat code for 3.7-beta2.

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px">                if ( is_array( $checksums ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        foreach ( $checksums as $file => $checksum ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1078,7 +1078,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /** This filter is documented in wp-admin/includes/update-core.php */

</span><span class="cx" style="display: block; padding: 0 10px">        apply_filters( 'update_feedback', __( 'Enabling Maintenance mode&#8230;' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Create maintenance file to signal that we are upgrading

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Create maintenance file to signal that we are upgrading.

</ins><span class="cx" style="display: block; padding: 0 10px">         $maintenance_string = '<?php $upgrading = ' . time() . '; ?>';

</span><span class="cx" style="display: block; padding: 0 10px">        $maintenance_file   = $to . '.maintenance';

</span><span class="cx" style="display: block; padding: 0 10px">        $wp_filesystem->delete( $maintenance_file );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1092,7 +1092,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $result = new WP_Error( $result->get_error_code(), $result->get_error_message(), substr( $result->get_error_data(), strlen( $to ) ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Since we know the core files have copied over, we can now copy the version file

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Since we know the core files have copied over, we can now copy the version file.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! is_wp_error( $result ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! $wp_filesystem->copy( $from . $distro . 'wp-includes/version.php', $to . 'wp-includes/version.php', true /* overwrite */ ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $wp_filesystem->delete( $from, true );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1101,7 +1101,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_filesystem->chmod( $to . 'wp-includes/version.php', FS_CHMOD_FILE );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Check to make sure everything copied correctly, ignoring the contents of wp-content

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Check to make sure everything copied correctly, ignoring the contents of wp-content.

</ins><span class="cx" style="display: block; padding: 0 10px">         $skip   = array( 'wp-content' );

</span><span class="cx" style="display: block; padding: 0 10px">        $failed = array();

</span><span class="cx" style="display: block; padding: 0 10px">        if ( isset( $checksums ) && is_array( $checksums ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1124,7 +1124,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">-        // Some files didn't copy properly

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Some files didn't copy properly.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! empty( $failed ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $total_size = 0;

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $failed as $file ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1146,8 +1146,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"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Custom Content Directory needs updating now.

-       // Copy Languages

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Custom content directory needs updating now.

+       // Copy languages.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! is_wp_error( $result ) && $wp_filesystem->is_dir( $from . $distro . 'wp-content/languages' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( WP_LANG_DIR != ABSPATH . WPINC . '/languages' || @is_dir( WP_LANG_DIR ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $lang_dir = WP_LANG_DIR;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1155,9 +1155,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $lang_dir = WP_CONTENT_DIR . '/languages';

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( ! @is_dir( $lang_dir ) && 0 === strpos( $lang_dir, ABSPATH ) ) { // Check the language directory exists first

-                       $wp_filesystem->mkdir( $to . str_replace( ABSPATH, '', $lang_dir ), FS_CHMOD_DIR ); // If it's within the ABSPATH we can handle it here, otherwise they're out of luck.

-                       clearstatcache(); // for FTP, Need to clear the stat cache

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check if the language directory exists first.

+               if ( ! @is_dir( $lang_dir ) && 0 === strpos( $lang_dir, ABSPATH ) ) {

+                       // If it's within the ABSPATH we can handle it here, otherwise they're out of luck.

+                       $wp_filesystem->mkdir( $to . str_replace( ABSPATH, '', $lang_dir ), FS_CHMOD_DIR );

+                       clearstatcache(); // For FTP, need to clear the stat cache.

</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_dir( $lang_dir ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1173,7 +1175,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-admin/includes/update-core.php */

</span><span class="cx" style="display: block; padding: 0 10px">        apply_filters( 'update_feedback', __( 'Disabling Maintenance mode&#8230;' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Remove maintenance file, we're done with potential site-breaking changes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Remove maintenance file, we're done with potential site-breaking changes.

</ins><span class="cx" style="display: block; padding: 0 10px">         $wp_filesystem->delete( $maintenance_file );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">        // 3.5 -> 3.5+ - an empty twentytwelve directory was created upon upgrade to 3.5 for some users, preventing installation of Twenty Twelve.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1183,17 +1185,20 @@

</span><span class="cx" style="display: 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">-        // Copy New bundled plugins & themes

-       // This gives us the ability to install new plugins & themes bundled with future versions of WordPress whilst avoiding the re-install upon upgrade issue.

-       // $development_build controls us overwriting bundled themes and plugins when a non-stable release is being updated

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*

+        * Copy new bundled plugins & themes.

+        * This gives us the ability to install new plugins & themes bundled with

+        * future versions of WordPress whilst avoiding the re-install upon upgrade issue.

+        * $development_build controls us overwriting bundled themes and plugins when a non-stable release is being updated.

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! is_wp_error( $result ) && ( ! defined( 'CORE_UPGRADE_SKIP_NEW_BUNDLED' ) || ! CORE_UPGRADE_SKIP_NEW_BUNDLED ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( (array) $_new_bundled_files as $file => $introduced_version ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // If a $development_build or if $introduced version is greater than what the site was previously running

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // If a $development_build or if $introduced version is greater than what the site was previously running.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( $development_build || version_compare( $introduced_version, $old_wp_version, '>' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $directory             = ( '/' == $file[ strlen( $file ) - 1 ] );

</span><span class="cx" style="display: block; padding: 0 10px">                                list($type, $filename) = explode( '/', $file, 2 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Check to see if the bundled items exist before attempting to copy them

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Check to see if the bundled items exist before attempting to copy them.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( ! $wp_filesystem->exists( $from . $distro . 'wp-content/' . $file ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        continue;

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1201,7 +1206,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( 'plugins' == $type ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        $dest = $wp_filesystem->wp_plugins_dir();

</span><span class="cx" style="display: block; padding: 0 10px">                                } elseif ( 'themes' == $type ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        $dest = trailingslashit( $wp_filesystem->wp_themes_dir() ); // Back-compat, ::wp_themes_dir() did not return trailingslash'd pre-3.2

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Back-compat, ::wp_themes_dir() did not return trailingslash'd pre-3.2.

+                                       $dest = trailingslashit( $wp_filesystem->wp_themes_dir() );

</ins><span class="cx" style="display: block; padding: 0 10px">                                 } else {

</span><span class="cx" style="display: block; padding: 0 10px">                                        continue;

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1231,16 +1237,16 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        }

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                } //end foreach

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         } // End foreach.

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Handle $result error from the above blocks

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Handle $result error from the above blocks.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( is_wp_error( $result ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_filesystem->delete( $from, true );

</span><span class="cx" style="display: block; padding: 0 10px">                return $result;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Remove old files

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Remove old files.

</ins><span class="cx" style="display: block; padding: 0 10px">         foreach ( $_old_files as $old_file ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $old_file = $to . $old_file;

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! $wp_filesystem->exists( $old_file ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1253,27 +1259,27 @@

</span><span class="cx" style="display: 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">-        // Remove any Genericons example.html's from the filesystem

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Remove any Genericons example.html's from the filesystem.

</ins><span class="cx" style="display: block; padding: 0 10px">         _upgrade_422_remove_genericons();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Remove the REST API plugin if its version is Beta 4 or lower

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Remove the REST API plugin if its version is Beta 4 or lower.

</ins><span class="cx" style="display: block; padding: 0 10px">         _upgrade_440_force_deactivate_incompatible_plugins();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Upgrade DB with separate request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Upgrade DB with separate request.

</ins><span class="cx" style="display: block; padding: 0 10px">         /** This filter is documented in wp-admin/includes/update-core.php */

</span><span class="cx" style="display: block; padding: 0 10px">        apply_filters( 'update_feedback', __( 'Upgrading database&#8230;' ) );

</span><span class="cx" style="display: block; padding: 0 10px">        $db_upgrade_url = admin_url( 'upgrade.php?step=upgrade_db' );

</span><span class="cx" style="display: block; padding: 0 10px">        wp_remote_post( $db_upgrade_url, array( 'timeout' => 60 ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Clear the cache to prevent an update_option() from saving a stale db_version to the cache

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Clear the cache to prevent an update_option() from saving a stale db_version to the cache.

</ins><span class="cx" style="display: block; padding: 0 10px">         wp_cache_flush();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // (Not all cache back ends listen to 'flush')

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Not all cache back ends listen to 'flush'.

</ins><span class="cx" style="display: block; padding: 0 10px">         wp_cache_delete( 'alloptions', 'options' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Remove working directory

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Remove working directory.

</ins><span class="cx" style="display: block; padding: 0 10px">         $wp_filesystem->delete( $from, 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">-        // Force refresh of update information

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Force refresh of update information.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( function_exists( 'delete_site_transient' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                delete_site_transient( 'update_core' );

</span><span class="cx" style="display: block; padding: 0 10px">        } else {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1396,7 +1402,7 @@

<span class="cx" style="display: block; padding: 0 10px">        // Load the updated default text localization domain for new strings.

</span><span class="cx" style="display: block; padding: 0 10px">        load_default_textdomain();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // See do_core_upgrade()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // See do_core_upgrade().

</ins><span class="cx" style="display: block; padding: 0 10px">         show_message( __( 'WordPress updated successfully' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">        // self_admin_url() won't exist when upgrading from <= 3.0, so relative URLs are intentional.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1442,13 +1448,13 @@

<span class="cx" style="display: block; padding: 0 10px">        // A list of the affected files using the filesystem absolute paths.

</span><span class="cx" style="display: block; padding: 0 10px">        $affected_files = array();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Themes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Themes.

</ins><span class="cx" style="display: block; padding: 0 10px">         foreach ( $wp_theme_directories as $directory ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $affected_theme_files = _upgrade_422_find_genericons_files_in_folder( $directory );

</span><span class="cx" style="display: block; padding: 0 10px">                $affected_files       = array_merge( $affected_files, $affected_theme_files );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Plugins

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Plugins.

</ins><span class="cx" style="display: block; padding: 0 10px">         $affected_plugin_files = _upgrade_422_find_genericons_files_in_folder( WP_PLUGIN_DIR );

</span><span class="cx" style="display: block; padding: 0 10px">        $affected_files        = array_merge( $affected_files, $affected_plugin_files );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1458,7 +1464,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        continue;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // The path when the file is accessed via WP_Filesystem may differ in the case of FTP

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // The path when the file is accessed via WP_Filesystem may differ in the case of FTP.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $remote_file = $gen_dir . basename( $file );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! $wp_filesystem->exists( $remote_file ) ) {

</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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/update.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -723,7 +723,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">  * @return void|false

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function maintenance_nag() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        include( ABSPATH . WPINC . '/version.php' ); // include an unmodified $wp_version

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Include an unmodified $wp_version.

+       include( ABSPATH . WPINC . '/version.php' );

</ins><span class="cx" style="display: block; padding: 0 10px">         global $upgrading;

</span><span class="cx" style="display: block; padding: 0 10px">        $nag = isset( $upgrading );

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! $nag ) {

</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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/upgrade.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -154,7 +154,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function wp_install_defaults( $user_id ) {

</span><span class="cx" style="display: block; padding: 0 10px">                global $wpdb, $wp_rewrite, $table_prefix;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Default category

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Default category.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $cat_name = __( 'Uncategorized' );

</span><span class="cx" style="display: block; padding: 0 10px">                /* translators: Default category slug. */

</span><span class="cx" style="display: block; padding: 0 10px">                $cat_slug = sanitize_title( _x( 'Uncategorized', 'Default category slug' ) );

</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">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $cat_tt_id = $wpdb->insert_id;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // First post

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // First post.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $now             = current_time( 'mysql' );

</span><span class="cx" style="display: block; padding: 0 10px">                $now_gmt         = current_time( 'mysql', 1 );

</span><span class="cx" style="display: block; padding: 0 10px">                $first_post_guid = get_option( 'home' ) . '/?p=1';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -219,7 +219,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                sprintf( '<a href="%s">%s</a>', esc_url( network_home_url() ), get_network()->site_name )

</span><span class="cx" style="display: block; padding: 0 10px">                        );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Back-compat for pre-4.4

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Back-compat for pre-4.4.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $first_post = str_replace( 'SITE_URL', esc_url( network_home_url() ), $first_post );

</span><span class="cx" style="display: block; padding: 0 10px">                        $first_post = str_replace( 'SITE_NAME', get_network()->site_name, $first_post );

</span><span class="cx" style="display: block; padding: 0 10px">                } else {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -257,7 +257,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Default comment

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Default comment.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( is_multisite() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $first_comment_author = get_site_option( 'first_comment_author' );

</span><span class="cx" style="display: block; padding: 0 10px">                        $first_comment_email  = get_site_option( 'first_comment_email' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -286,7 +286,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">-                // First Page

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // First page.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( is_multisite() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $first_page = get_site_option( 'first_page' );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -352,7 +352,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Privacy Policy page

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Privacy Policy page.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( is_multisite() ) {

<span class="cx" style="display: block; padding: 0 10px">                        // Disable by default unless the suggested content is provided.

</span><span class="cx" style="display: block; padding: 0 10px">                        $privacy_policy_content = get_site_option( 'default_privacy_policy_content' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -493,7 +493,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $wpdb->query( $wpdb->prepare( "DELETE FROM $wpdb->usermeta WHERE user_id != %d AND meta_key = %s", $user_id, $table_prefix . 'user_level' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $wpdb->query( $wpdb->prepare( "DELETE FROM $wpdb->usermeta WHERE user_id != %d AND meta_key = %s", $user_id, $table_prefix . 'capabilities' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Delete any caps that snuck into the previously active blog. (Hardcoded to blog 1 for now.) TODO: Get previous_blog_id.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Delete any caps that snuck into the previously active blog. (Hardcoded to blog 1 for now.)

+                       // TODO: Get previous_blog_id.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( ! is_super_admin( $user_id ) && $user_id != 1 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $wpdb->delete(

</span><span class="cx" style="display: block; padding: 0 10px">                                        $wpdb->usermeta,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -550,7 +551,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $test_url = '';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test against a real WordPress Post

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test against a real WordPress post.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $first_post = get_page_by_path( sanitize_title( _x( 'hello-world', 'Default post slug' ) ), OBJECT, 'post' );

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $first_post ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $test_url = get_permalink( $first_post->ID );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -852,7 +853,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> function upgrade_100() {

</span><span class="cx" style="display: block; padding: 0 10px">        global $wpdb;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Get the title and ID of every post, post_name to check if it already has a value

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Get the title and ID of every post, post_name to check if it already has a value.

</ins><span class="cx" style="display: block; padding: 0 10px">         $posts = $wpdb->get_results( "SELECT ID, post_title, post_name FROM $wpdb->posts WHERE post_name = ''" );

</span><span class="cx" style="display: block; padding: 0 10px">        if ( $posts ) {

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $posts as $post ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -891,9 +892,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $allposts = $wpdb->get_results( "SELECT ID, post_category FROM $wpdb->posts WHERE post_category != '0' $catwhere" );

</span><span class="cx" style="display: block; padding: 0 10px">        if ( $allposts ) :

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $allposts as $post ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Check to see if it's already been imported

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Check to see if it's already been imported.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $cat = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->post2cat WHERE post_id = %d AND category_id = %d", $post->ID, $post->post_category ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( ! $cat && 0 != $post->post_category ) { // If there's no result

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 if ( ! $cat && 0 != $post->post_category ) { // If there's no result.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $wpdb->insert(

</span><span class="cx" style="display: block; padding: 0 10px">                                        $wpdb->post2cat,

</span><span class="cx" style="display: block; padding: 0 10px">                                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -917,7 +918,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> function upgrade_101() {

</span><span class="cx" style="display: block; padding: 0 10px">        global $wpdb;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Clean up indices, add a few

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Clean up indices, add a few.

</ins><span class="cx" style="display: block; padding: 0 10px">         add_clean_index( $wpdb->posts, 'post_name' );

</span><span class="cx" style="display: block; padding: 0 10px">        add_clean_index( $wpdb->posts, 'post_status' );

</span><span class="cx" style="display: block; padding: 0 10px">        add_clean_index( $wpdb->categories, 'category_nicename' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -954,7 +955,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">-        // Get the GMT offset, we'll use that later on

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Get the GMT offset, we'll use that later on.

</ins><span class="cx" style="display: block; padding: 0 10px">         $all_options = get_alloptions_110();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $time_difference = $all_options->time_difference;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -968,17 +969,19 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $diff_gmt_weblogger    = $diff_gmt_server - $diff_weblogger_server;

</span><span class="cx" style="display: block; padding: 0 10px">        $gmt_offset            = -$diff_gmt_weblogger;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Add a gmt_offset option, with value $gmt_offset

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Add a gmt_offset option, with value $gmt_offset.

</ins><span class="cx" style="display: block; padding: 0 10px">         add_option( 'gmt_offset', $gmt_offset );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Check if we already set the GMT fields (if we did, then

-       // MAX(post_date_gmt) can't be '0000-00-00 00:00:00'

-       // <michel_v> I just slapped myself silly for not thinking about it earlier

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*

+        * Check if we already set the GMT fields. If we did, then

+        * MAX(post_date_gmt) can't be '0000-00-00 00:00:00'.

+        * <michel_v> I just slapped myself silly for not thinking about it earlier.

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         $got_gmt_fields = ! ( $wpdb->get_var( "SELECT MAX(post_date_gmt) FROM $wpdb->posts" ) == '0000-00-00 00:00:00' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! $got_gmt_fields ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Add or subtract time to all dates, to get GMT dates

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Add or subtract time to all dates, to get GMT dates.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $add_hours   = intval( $diff_gmt_weblogger );

</span><span class="cx" style="display: block; padding: 0 10px">                $add_minutes = intval( 60 * ( $diff_gmt_weblogger - $add_hours ) );

</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -1052,17 +1055,17 @@

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'active_plugins', $active_plugins );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Obsolete tables

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Obsolete tables.

</ins><span class="cx" style="display: block; padding: 0 10px">         $wpdb->query( 'DROP TABLE IF EXISTS ' . $wpdb->prefix . 'optionvalues' );

</span><span class="cx" style="display: block; padding: 0 10px">        $wpdb->query( 'DROP TABLE IF EXISTS ' . $wpdb->prefix . 'optiontypes' );

</span><span class="cx" style="display: block; padding: 0 10px">        $wpdb->query( 'DROP TABLE IF EXISTS ' . $wpdb->prefix . 'optiongroups' );

</span><span class="cx" style="display: block; padding: 0 10px">        $wpdb->query( 'DROP TABLE IF EXISTS ' . $wpdb->prefix . 'optiongroup_options' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Update comments table to use comment_type

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Update comments table to use comment_type.

</ins><span class="cx" style="display: block; padding: 0 10px">         $wpdb->query( "UPDATE $wpdb->comments SET comment_type='trackback', comment_content = REPLACE(comment_content, '<trackback />', '') WHERE comment_content LIKE '<trackback />%'" );

</span><span class="cx" style="display: block; padding: 0 10px">        $wpdb->query( "UPDATE $wpdb->comments SET comment_type='pingback', comment_content = REPLACE(comment_content, '<pingback />', '') WHERE comment_content LIKE '<pingback />%'" );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Some versions have multiple duplicate option_name rows with the same values

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Some versions have multiple duplicate option_name rows with the same values.

</ins><span class="cx" style="display: block; padding: 0 10px">         $options = $wpdb->get_results( "SELECT option_name, COUNT(option_name) AS dupes FROM `$wpdb->options` GROUP BY option_name" );

</span><span class="cx" style="display: block; padding: 0 10px">        foreach ( $options as $option ) {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( 1 != $option->dupes ) { // Could this be done in the query?

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1370,7 +1373,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        if ( $wp_current_db_version < 3570 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                /*

</span><span class="cx" style="display: block; padding: 0 10px">                 * Create link_category terms for link categories. Create a map of link

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 * cat IDs to link_category terms.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+          * category IDs to link_category terms.

</ins><span class="cx" style="display: block; padding: 0 10px">                  */

</span><span class="cx" style="display: block; padding: 0 10px">                $link_cat_id_map  = array();

</span><span class="cx" style="display: block; padding: 0 10px">                $default_link_cat = 0;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1411,7 +1414,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $tt_ids[ $term_id ] = (int) $wpdb->insert_id;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Associate links to cats.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Associate links to categories.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $links = $wpdb->get_results( "SELECT link_id, link_category FROM $wpdb->links" );

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! empty( $links ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        foreach ( $links as $link ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1460,11 +1463,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( $wp_current_db_version < 4772 ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Obsolete linkcategories table

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Obsolete linkcategories table.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $wpdb->query( 'DROP TABLE IF EXISTS ' . $wpdb->prefix . 'linkcategories' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Recalculate all counts

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Recalculate all counts.

</ins><span class="cx" style="display: block; padding: 0 10px">         $terms = $wpdb->get_results( "SELECT term_taxonomy_id, taxonomy FROM $wpdb->term_taxonomy" );

</span><span class="cx" style="display: block; padding: 0 10px">        foreach ( (array) $terms as $term ) {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ( 'post_tag' == $term->taxonomy ) || ( 'category' == $term->taxonomy ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1586,7 +1589,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                populate_roles_270();

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Update post_date for unpublished posts with empty timestamp

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Update post_date for unpublished posts with empty timestamp.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( $wp_current_db_version < 8921 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $wpdb->query( "UPDATE $wpdb->posts SET post_date = post_modified WHERE post_date = '0000-00-00 00:00:00'" );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1637,7 +1640,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">        global $wp_current_db_version;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( $wp_current_db_version < 11958 ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Previously, setting depth to 1 would redundantly disable threading, but now 2 is the minimum depth to avoid confusion

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Previously, setting depth to 1 would redundantly disable threading,

+               // but now 2 is the minimum depth to avoid confusion.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( get_option( 'thread_comments_depth' ) == '1' ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        update_option( 'thread_comments_depth', 2 );

</span><span class="cx" style="display: block; padding: 0 10px">                        update_option( 'thread_comments', 0 );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1769,7 +1773,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $sidebars_widgets                   = $_sidebars_widgets;

</span><span class="cx" style="display: block; padding: 0 10px">                        unset( $_sidebars_widgets );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // intentional fall-through to upgrade to the next version.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Intentional fall-through to upgrade to the next version.

</ins><span class="cx" style="display: block; padding: 0 10px">                 case 2:

</span><span class="cx" style="display: block; padding: 0 10px">                        $sidebars_widgets                  = retrieve_widgets();

</span><span class="cx" style="display: block; padding: 0 10px">                        $sidebars_widgets['array_version'] = 3;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1827,7 +1831,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        global $wp_current_db_version, $wpdb;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( $wp_current_db_version < 22006 && $wpdb->get_var( "SELECT link_id FROM $wpdb->links LIMIT 1" ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                update_option( 'link_manager_enabled', 1 ); // Previously set to 0 by populate_options()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         update_option( 'link_manager_enabled', 1 ); // Previously set to 0 by populate_options().

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( $wp_current_db_version < 21811 && wp_should_upgrade_global_tables() ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2021,7 +2025,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">  * @since 4.3.1

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function upgrade_431() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Fix incorrect cron entries for term splitting

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Fix incorrect cron entries for term splitting.

</ins><span class="cx" style="display: block; padding: 0 10px">         $cron_array = _get_cron_array();

</span><span class="cx" style="display: block; padding: 0 10px">        if ( isset( $cron_array['wp_batch_split_terms'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                unset( $cron_array['wp_batch_split_terms'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2138,11 +2142,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">  * @since 5.3.0

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function upgrade_530() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // The `admin_email_lifespan` option may have been set by an admin that just logged in,

-       // saw the verification screen, clicked on a button there, and is now upgrading the db,

-       // or by populate_options() that is called earlier in upgrade_all().

-       // In the second case `admin_email_lifespan` should be reset so the verification screen

-       // is shown next time an admin logs in.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*

+        * The `admin_email_lifespan` option may have been set by an admin that just logged in,

+        * saw the verification screen, clicked on a button there, and is now upgrading the db,

+        * or by populate_options() that is called earlier in upgrade_all().

+        * In the second case `admin_email_lifespan` should be reset so the verification screen

+        * is shown next time an admin logs in.

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( function_exists( 'current_user_can' ) && ! current_user_can( 'manage_options' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'admin_email_lifespan', 0 );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2159,10 +2165,10 @@

</span><span class="cx" style="display: block; padding: 0 10px"> function upgrade_network() {

</span><span class="cx" style="display: block; padding: 0 10px">        global $wp_current_db_version, $wpdb;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Always clear expired transients

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Always clear expired transients.

</ins><span class="cx" style="display: block; padding: 0 10px">         delete_expired_transients( 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">-        // 2.8.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // 2.8

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( $wp_current_db_version < 11549 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $wpmu_sitewide_plugins   = get_site_option( 'wpmu_sitewide_plugins' );

</span><span class="cx" style="display: block; padding: 0 10px">                $active_sitewide_plugins = get_site_option( 'active_sitewide_plugins' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2301,7 +2307,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">-// General functions we use to actually do stuff

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// General functions we use to actually do stuff.

</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">@@ -2328,7 +2334,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                return true;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Didn't find it try to create it..

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Didn't find it, so try to create it.

</ins><span class="cx" style="display: block; padding: 0 10px">         $wpdb->query( $create_ddl );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">        // We cannot directly tell that whether this succeeded!

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2353,7 +2359,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        global $wpdb;

</span><span class="cx" style="display: block; padding: 0 10px">        $wpdb->hide_errors();

</span><span class="cx" style="display: block; padding: 0 10px">        $wpdb->query( "ALTER TABLE `$table` DROP INDEX `$index`" );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Now we need to take out all the extra ones we may have created

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Now we need to take out all the extra ones we may have created.

</ins><span class="cx" style="display: block; padding: 0 10px">         for ( $i = 0; $i < 25; $i++ ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $wpdb->query( "ALTER TABLE `$table` DROP INDEX `{$index}_$i`" );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2399,7 +2405,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"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Didn't find it try to create it.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Didn't find it, so try to create it.

</ins><span class="cx" style="display: block; padding: 0 10px">         $wpdb->query( $create_ddl );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">        // We cannot directly tell that whether this succeeded!

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2566,7 +2572,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $queries = wp_get_db_schema( $queries );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Separate individual queries into an array

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Separate individual queries into an array.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! is_array( $queries ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $queries = explode( ';', $queries );

</span><span class="cx" style="display: block; padding: 0 10px">                $queries = array_filter( $queries );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2581,11 +2587,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        $queries = apply_filters( 'dbdelta_queries', $queries );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $cqueries   = array(); // Creation Queries

-       $iqueries   = array(); // Insertion Queries

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cqueries   = array(); // Creation queries.

+       $iqueries   = array(); // Insertion queries.

</ins><span class="cx" style="display: block; padding: 0 10px">         $for_update = array();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Create a tablename index for an array ($cqueries) of queries

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Create a tablename index for an array ($cqueries) of queries.

</ins><span class="cx" style="display: block; padding: 0 10px">         foreach ( $queries as $qry ) {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( preg_match( '|CREATE TABLE ([^ ]*)|', $qry, $matches ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $cqueries[ trim( $matches[1], '`' ) ] = $qry;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2597,7 +2603,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                } elseif ( preg_match( '|UPDATE ([^ ]*)|', $qry, $matches ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $iqueries[] = $qry;

</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">-                        // Unrecognized query type

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Unrecognized query type.

</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">@@ -2634,7 +2640,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        continue;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Fetch the table column structure from the database

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Fetch the table column structure from the database.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $suppress    = $wpdb->suppress_errors();

</span><span class="cx" style="display: block; padding: 0 10px">                $tablefields = $wpdb->get_results( "DESCRIBE {$table};" );

</span><span class="cx" style="display: block; padding: 0 10px">                $wpdb->suppress_errors( $suppress );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2782,7 +2788,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $tablefield_field_lowercased = strtolower( $tablefield->Field );

</span><span class="cx" style="display: block; padding: 0 10px">                        $tablefield_type_lowercased  = strtolower( $tablefield->Type );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // If the table field exists in the field array ...

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // If the table field exists in the field array...

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( array_key_exists( $tablefield_field_lowercased, $cfields ) ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                                // Get the field type from the query.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2807,7 +2813,8 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                        if ( $do_change ) {

<span class="cx" style="display: block; padding: 0 10px">                                                // Add a query to change the column type.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                $cqueries[]                                      = "ALTER TABLE {$table} CHANGE COLUMN `{$tablefield->Field}` " . $cfields[ $tablefield_field_lowercased ];

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         $cqueries[] = "ALTER TABLE {$table} CHANGE COLUMN `{$tablefield->Field}` " . $cfields[ $tablefield_field_lowercased ];

+

</ins><span class="cx" style="display: block; padding: 0 10px">                                                 $for_update[ $table . '.' . $tablefield->Field ] = "Changed type of {$table}.{$tablefield->Field} from {$tablefield->Type} to {$fieldtype}";

</span><span class="cx" style="display: block; padding: 0 10px">                                        }

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2817,7 +2824,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        $default_value = $matches[1];

</span><span class="cx" style="display: block; padding: 0 10px">                                        if ( $tablefield->Default != $default_value ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                // Add a query to change the column's default value

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                $cqueries[]                                      = "ALTER TABLE {$table} ALTER COLUMN `{$tablefield->Field}` SET DEFAULT '{$default_value}'";

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         $cqueries[] = "ALTER TABLE {$table} ALTER COLUMN `{$tablefield->Field}` SET DEFAULT '{$default_value}'";

+

</ins><span class="cx" style="display: block; padding: 0 10px">                                                 $for_update[ $table . '.' . $tablefield->Field ] = "Changed default value of {$table}.{$tablefield->Field} from {$tablefield->Default} to {$default_value}";

</span><span class="cx" style="display: block; padding: 0 10px">                                        }

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2832,7 +2840,8 @@

<span class="cx" style="display: block; padding: 0 10px">                // For every remaining field specified for the table.

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $cfields as $fieldname => $fielddef ) {

<span class="cx" style="display: block; padding: 0 10px">                        // Push a query line into $cqueries that adds the field to that table.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $cqueries[]                              = "ALTER TABLE {$table} ADD COLUMN $fielddef";

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $cqueries[] = "ALTER TABLE {$table} ADD COLUMN $fielddef";

+

</ins><span class="cx" style="display: block; padding: 0 10px">                         $for_update[ $table . '.' . $fieldname ] = 'Added column ' . $table . '.' . $fieldname;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2845,9 +2854,9 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                        // For every index in the table.

</span><span class="cx" style="display: block; padding: 0 10px">                        foreach ( $tableindices as $tableindex ) {

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                $keyname = strtolower( $tableindex->Key_name );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                                // Add the index to the index data array.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $keyname                             = strtolower( $tableindex->Key_name );

</del><span class="cx" style="display: block; padding: 0 10px">                                 $index_ary[ $keyname ]['columns'][]  = array(

</span><span class="cx" style="display: block; padding: 0 10px">                                        'fieldname' => $tableindex->Column_name,

</span><span class="cx" style="display: block; padding: 0 10px">                                        'subpart'   => $tableindex->Sub_part,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2904,7 +2913,8 @@

<span class="cx" style="display: block; padding: 0 10px">                // For every remaining index specified for the table.

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( (array) $indices as $index ) {

<span class="cx" style="display: block; padding: 0 10px">                        // Push a query line into $cqueries that adds the index to that table.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $cqueries[]   = "ALTER TABLE {$table} ADD $index";

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $cqueries[] = "ALTER TABLE {$table} ADD $index";

+

</ins><span class="cx" style="display: block; padding: 0 10px">                         $for_update[] = 'Added index ' . $table . ' ' . $index;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3068,7 +3078,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $default_dir = WP_CONTENT_DIR . '/themes/' . WP_DEFAULT_THEME;

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">        // Copy files from the default theme to the site theme.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        //$files = array('index.php', 'comments.php', 'comments-popup.php', 'footer.php', 'header.php', 'sidebar.php', 'style.css');

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // $files = array( 'index.php', 'comments.php', 'comments-popup.php', 'footer.php', 'header.php', 'sidebar.php', 'style.css' );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $theme_dir = @opendir( $default_dir );

</span><span class="cx" style="display: block; padding: 0 10px">        if ( $theme_dir ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3269,7 +3279,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> function pre_schema_upgrade() {

</span><span class="cx" style="display: block; padding: 0 10px">        global $wp_current_db_version, $wpdb;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Upgrade versions prior to 2.9

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Upgrade versions prior to 2.9.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( $wp_current_db_version < 11557 ) {

<span class="cx" style="display: block; padding: 0 10px">                // Delete duplicate options. Keep the option with the highest option_id.

</span><span class="cx" style="display: block; padding: 0 10px">                $wpdb->query( "DELETE o1 FROM $wpdb->options AS o1 JOIN $wpdb->options AS o2 USING (`option_name`) WHERE o2.option_id > o1.option_id" );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3284,7 +3294,7 @@

<span class="cx" style="display: block; padding: 0 10px">        // Multisite schema upgrades.

</span><span class="cx" style="display: block; padding: 0 10px">        if ( $wp_current_db_version < 25448 && is_multisite() && wp_should_upgrade_global_tables() ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Upgrade versions prior to 3.7

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Upgrade versions prior to 3.7.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $wp_current_db_version < 25179 ) {

<span class="cx" style="display: block; padding: 0 10px">                        // New primary key for signups.

</span><span class="cx" style="display: block; padding: 0 10px">                        $wpdb->query( "ALTER TABLE $wpdb->signups ADD signup_id BIGINT(20) NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST" );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3342,7 +3352,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">   KEY last_updated (last_updated)

</span><span class="cx" style="display: block; padding: 0 10px"> ) $charset_collate;

</span><span class="cx" style="display: block; padding: 0 10px"> ";

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // now create tables

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Now create tables.

</ins><span class="cx" style="display: block; padding: 0 10px">                 dbDelta( $ms_queries );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> endif;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3367,20 +3377,20 @@

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function wp_should_upgrade_global_tables() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Return false early if explicitly not upgrading

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Return false early if explicitly not upgrading.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) {

</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">-        // Assume global tables should be upgraded

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Assume global tables should be upgraded.

</ins><span class="cx" style="display: block; padding: 0 10px">         $should_upgrade = 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">-        // Set to false if not on main network (does not matter if not multi-network)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Set to false if not on main network (does not matter if not multi-network).

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! is_main_network() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $should_upgrade = 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">-        // Set to false if not on main site of current network (does not matter if not multi-site)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Set to false if not on main site of current network (does not matter if not multi-site).

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! is_main_site() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $should_upgrade = false;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span></span></pre></div>

<a id="trunksrcwpadminincludesuserphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/user.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/user.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/user.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -393,7 +393,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">-                // Clean links

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Clean links.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $link_ids = $wpdb->get_col( $wpdb->prepare( "SELECT link_id FROM $wpdb->links WHERE link_owner = %d", $id ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $link_ids ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -418,7 +418,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // FINALLY, delete user

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // FINALLY, delete user.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( is_multisite() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                remove_user_from_blog( $id, get_current_blog_id() );

</span><span class="cx" style="display: block; padding: 0 10px">        } else {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -474,7 +474,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"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // get_user_setting = JS saved UI setting. else no-js-fallback code.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // get_user_setting() = JS-saved UI setting. Else no-js-fallback code.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( 'hide' == get_user_setting( 'default_password_nag' ) || isset( $_GET['default_password_nag'] ) && '0' == $_GET['default_password_nag'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                delete_user_setting( 'default_password_nag' );

</span><span class="cx" style="display: block; padding: 0 10px">                update_user_option( $user_ID, 'default_password_nag', false, true );

</span></span></pre></div>

<a id="trunksrcwpadminincludeswidgetsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/widgets.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/widgets.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/includes/widgets.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,7 +22,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $done = array();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        foreach ( $sort as $widget ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( in_array( $widget['callback'], $done, true ) ) { // We already showed this multi-widget

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( in_array( $widget['callback'], $done, true ) ) { // We already showed this multi-widget.

</ins><span class="cx" style="display: block; padding: 0 10px">                         continue;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -142,8 +142,8 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $params[0]['before_widget'] = "<div id='widget-{$i}_{$id}' class='widget'$hidden>";

</span><span class="cx" style="display: block; padding: 0 10px">        $params[0]['after_widget']  = '</div>';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $params[0]['before_title']  = '%BEG_OF_TITLE%'; // deprecated

-       $params[0]['after_title']   = '%END_OF_TITLE%'; // deprecated

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $params[0]['before_title']  = '%BEG_OF_TITLE%'; // Deprecated.

+       $params[0]['after_title']   = '%END_OF_TITLE%'; // Deprecated.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( is_callable( $wp_registered_widgets[ $widget_id ]['callback'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_registered_widgets[ $widget_id ]['_callback'] = $wp_registered_widgets[ $widget_id ]['callback'];

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -192,7 +192,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $widget_id  = $sidebar_args['widget_id'];

</span><span class="cx" style="display: block; padding: 0 10px">        $sidebar_id = isset( $sidebar_args['id'] ) ? $sidebar_args['id'] : false;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $key        = $sidebar_id ? array_search( $widget_id, $sidebars_widgets[ $sidebar_id ] ) : '-1'; // position of widget in sidebar

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $key        = $sidebar_id ? array_search( $widget_id, $sidebars_widgets[ $sidebar_id ] ) : '-1'; // Position of widget in sidebar.

</ins><span class="cx" style="display: block; padding: 0 10px">         $control    = isset( $wp_registered_widget_controls[ $widget_id ] ) ? $wp_registered_widget_controls[ $widget_id ] : array();

</span><span class="cx" style="display: block; padding: 0 10px">        $widget     = $wp_registered_widgets[ $widget_id ];

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -226,7 +226,7 @@

<span class="cx" style="display: block; padding: 0 10px">         * for a multi-widget control.

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        if ( isset( $sidebar_args['_display'] ) && 'template' == $sidebar_args['_display'] && $widget_number ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // number == -1 implies a template where id numbers are replaced by a generic '__i__'

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // number == -1 implies a template where id numbers are replaced by a generic '__i__'.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $control['params'][0]['number'] = -1;

<span class="cx" style="display: block; padding: 0 10px">                // With id_base widget id's are constructed like {$id_base}-{$id_number}.

</span><span class="cx" style="display: block; padding: 0 10px">                if ( isset( $control['id_base'] ) ) {

</span></span></pre></div>

<a id="trunksrcwpadmininstallhelperphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/install-helper.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/install-helper.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/install-helper.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,7 +18,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">  *     $error_count = 0;

</span><span class="cx" style="display: block; padding: 0 10px">  *     $tablename = $wpdb->links;

</span><span class="cx" style="display: block; padding: 0 10px">  *     // Check the column.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *     if ( ! check_column($wpdb->links, 'link_description', 'varchar( 255 )' ) ) {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *     if ( ! check_column( $wpdb->links, 'link_description', 'varchar( 255 )' ) ) {

</ins><span class="cx" style="display: block; padding: 0 10px">  *         $ddl = "ALTER TABLE $wpdb->links MODIFY COLUMN link_description varchar(255) NOT NULL DEFAULT '' ";

</span><span class="cx" style="display: block; padding: 0 10px">  *         $q = $wpdb->query( $ddl );

</span><span class="cx" style="display: block; padding: 0 10px">  *     }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -194,7 +194,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">                        return true;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                } // end if found our column

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         } // End if found our column.

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</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="trunksrcwpadmininstallphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/install.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/install.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/install.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,7 +77,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> <p id="logo"><a href="<?php echo esc_url( __( 'https://wordpress.org/' ) ); ?>"><?php _e( 'WordPress' ); ?></a></p>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        <?php

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-} // end display_header()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+} // End display_header().

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> /**

<span class="cx" style="display: block; padding: 0 10px">  * Display installer setup form.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,7 +94,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $sql        = $wpdb->prepare( 'SHOW TABLES LIKE %s', $wpdb->esc_like( $wpdb->users ) );

</span><span class="cx" style="display: block; padding: 0 10px">        $user_table = ( $wpdb->get_var( $sql ) != null );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Ensure that Blogs appear in search engines by default.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Ensure that sites appear in search engines by default.

</ins><span class="cx" style="display: block; padding: 0 10px">         $blog_public = 1;

</span><span class="cx" style="display: block; padding: 0 10px">        if ( isset( $_POST['weblog_title'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $blog_public = isset( $_POST['blog_public'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -209,7 +209,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        <input type="hidden" name="language" value="<?php echo isset( $_REQUEST['language'] ) ? esc_attr( $_REQUEST['language'] ) : ''; ?>" />

</span><span class="cx" style="display: block; padding: 0 10px"> </form>

</span><span class="cx" style="display: block; padding: 0 10px">        <?php

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-} // end display_setup_form()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+} // End display_setup_form().

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px"> // Let's check to make sure WP isn't already installed.

</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_blog_installed() ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -303,7 +303,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> $scripts_to_print = array( 'jquery' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $step ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        case 0: // Step 0

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ case 0: // Step 0.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( wp_can_install_language_pack() && empty( $language ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $languages = wp_get_available_translations();

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( $languages ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -355,7 +355,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $scripts_to_print[] = 'user-profile';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                display_header();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Fill in the data we gathered

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Fill in the data we gathered.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $weblog_title         = isset( $_POST['weblog_title'] ) ? trim( wp_unslash( $_POST['weblog_title'] ) ) : '';

</span><span class="cx" style="display: block; padding: 0 10px">                $user_name            = isset( $_POST['user_name'] ) ? trim( wp_unslash( $_POST['user_name'] ) ) : '';

</span><span class="cx" style="display: block; padding: 0 10px">                $admin_password       = isset( $_POST['admin_password'] ) ? wp_unslash( $_POST['admin_password'] ) : '';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -366,7 +366,7 @@

<span class="cx" style="display: block; padding: 0 10px">                // Check email address.

</span><span class="cx" style="display: block; padding: 0 10px">                $error = false;

</span><span class="cx" style="display: block; padding: 0 10px">                if ( empty( $user_name ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // TODO: poka-yoke

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // TODO: Poka-yoke.

</ins><span class="cx" style="display: block; padding: 0 10px">                         display_setup_form( __( 'Please provide a valid username.' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $error = true;

</span><span class="cx" style="display: block; padding: 0 10px">                } elseif ( $user_name != sanitize_user( $user_name, true ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -373,15 +373,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        display_setup_form( __( 'The username you provided has invalid characters.' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $error = true;

</span><span class="cx" style="display: block; padding: 0 10px">                } elseif ( $admin_password != $admin_password_check ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // TODO: poka-yoke

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // TODO: Poka-yoke.

</ins><span class="cx" style="display: block; padding: 0 10px">                         display_setup_form( __( 'Your passwords do not match. Please try again.' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $error = true;

</span><span class="cx" style="display: block; padding: 0 10px">                } elseif ( empty( $admin_email ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // TODO: poka-yoke

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // TODO: Poka-yoke.

</ins><span class="cx" style="display: block; padding: 0 10px">                         display_setup_form( __( 'You must provide an email address.' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $error = true;

</span><span class="cx" style="display: block; padding: 0 10px">                } elseif ( ! is_email( $admin_email ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // TODO: poka-yoke

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // TODO: Poka-yoke.

</ins><span class="cx" style="display: block; padding: 0 10px">                         display_setup_form( __( 'Sorry, that isn&#8217;t a valid email address. Email addresses look like <code>username@example.com</code>.' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $error = true;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span></span></pre></div>

<a id="trunksrcwpadminlinkmanagerphp"></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/link-manager.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/link-manager.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/link-manager.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,7 +14,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> $wp_list_table = _get_list_table( 'WP_Links_List_Table' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Handle bulk deletes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Handle bulk deletes.

</ins><span class="cx" style="display: block; padding: 0 10px"> $doaction = $wp_list_table->current_action();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> if ( $doaction && isset( $_REQUEST['linkcheck'] ) ) {

</span></span></pre></div>

<a id="trunksrcwpadminlinkparseopmlphp"></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/link-parse-opml.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/link-parse-opml.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/link-parse-opml.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,7 +72,7 @@

<span class="cx" style="display: block; padding: 0 10px">        // Nothing to do.

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Create an XML parser

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Create an XML parser.

</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! function_exists( 'xml_parser_create' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">        trigger_error( __( "PHP's XML extension is not available. Please contact your hosting provider to enable PHP's XML extension." ) );

</span><span class="cx" style="display: block; padding: 0 10px">        wp_die( __( "PHP's XML extension is not available. Please contact your hosting provider to enable PHP's XML extension." ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,7 +80,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> $xml_parser = xml_parser_create();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Set the functions to handle opening and closing tags

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Set the functions to handle opening and closing tags.

</ins><span class="cx" style="display: block; padding: 0 10px"> xml_set_element_handler( $xml_parser, 'startElement', 'endElement' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! xml_parse( $xml_parser, $opml, true ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -92,5 +92,5 @@

</span><span class="cx" style="display: 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">-// Free up memory used by the XML parser

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Free up memory used by the XML parser.

</ins><span class="cx" style="display: block; padding: 0 10px"> xml_parser_free( $xml_parser );

</span></span></pre></div>

<a id="trunksrcwpadminloadscriptsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/load-scripts.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/load-scripts.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/load-scripts.php 2020-01-29 00:43:23 UTC (rev 47122)

</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"> require( ABSPATH . WPINC . '/script-loader.php' );

</span><span class="cx" style="display: block; padding: 0 10px"> require( ABSPATH . WPINC . '/version.php' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$expires_offset = 31536000; // 1 year

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$expires_offset = 31536000; // 1 year.

</ins><span class="cx" style="display: block; padding: 0 10px"> $out            = '';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> $wp_scripts = new WP_Scripts();

</span></span></pre></div>

<a id="trunksrcwpadminloadstylesphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/load-styles.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/load-styles.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/load-styles.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,7 +38,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"> $rtl            = ( isset( $_GET['dir'] ) && 'rtl' == $_GET['dir'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$expires_offset = 31536000; // 1 year

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$expires_offset = 31536000; // 1 year.

</ins><span class="cx" style="display: block; padding: 0 10px"> $out            = '';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> $wp_styles = new WP_Styles();

</span></span></pre></div>

<a id="trunksrcwpadminmedianewphp"></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-new.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/media-new.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/media-new.php    2020-01-29 00:43:23 UTC (rev 47122)

</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"> if ( $_POST ) {

</span><span class="cx" style="display: block; padding: 0 10px">        if ( isset( $_POST['html-upload'] ) && ! empty( $_FILES ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                check_admin_referer( 'media-form' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Upload File button was clicked

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Upload File button was clicked.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $upload_id = media_handle_upload( 'async-upload', $post_id );

</span><span class="cx" style="display: block; padding: 0 10px">                if ( is_wp_error( $upload_id ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        wp_die( $upload_id );

</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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/media-upload.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,7 +28,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> header( 'Content-Type: ' . get_option( 'html_type' ) . '; charset=' . get_option( 'blog_charset' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// IDs should be integers

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// IDs should be integers.

</ins><span class="cx" style="display: block; padding: 0 10px"> $ID      = isset( $ID ) ? (int) $ID : 0;

</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = isset( $post_id ) ? (int) $post_id : 0;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,7 +49,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Upload type: image, video, file, ..?

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Upload type: image, video, file, ...?

</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_GET['type'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">        $type = strval( $_GET['type'] );

</span><span class="cx" style="display: block; padding: 0 10px"> } else {

</span></span></pre></div>

<a id="trunksrcwpadminmenuheaderphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/menu-header.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/menu-header.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/menu-header.php  2020-01-29 00:43:23 UTC (rev 47122)

</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">        global $self, $parent_file, $submenu_file, $plugin_page, $typenow;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $first = true;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // 0 = menu_title, 1 = capability, 2 = menu_slug, 3 = page_title, 4 = classes, 5 = hookname, 6 = icon_url

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // 0 = menu_title, 1 = capability, 2 = menu_slug, 3 = page_title, 4 = classes, 5 = hookname, 6 = icon_url.

</ins><span class="cx" style="display: block; padding: 0 10px">         foreach ( $menu as $key => $item ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $admin_is_parent = false;

</span><span class="cx" style="display: block; padding: 0 10px">                $class           = array();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -184,7 +184,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $first = true;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // 0 = menu_title, 1 = capability, 2 = menu_slug, 3 = page_title, 4 = classes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // 0 = menu_title, 1 = capability, 2 = menu_slug, 3 = page_title, 4 = classes.

</ins><span class="cx" style="display: block; padding: 0 10px">                         foreach ( $submenu_items as $sub_key => $sub_item ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( ! current_user_can( $sub_item[1] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        continue;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -238,7 +238,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                $title = wptexturize( $sub_item[0] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( ! empty( $menu_hook ) || ( ( 'index.php' != $sub_item[2] ) && file_exists( WP_PLUGIN_DIR . "/$sub_file" ) && ! file_exists( ABSPATH . "/wp-admin/$sub_file" ) ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // If admin.php is the current page or if the parent exists as a file in the plugins or admin dir

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // If admin.php is the current page or if the parent exists as a file in the plugins or admin directory.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         if ( ( ! $admin_is_parent && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) && ! is_dir( WP_PLUGIN_DIR . "/{$item[2]}" ) ) || file_exists( $menu_file ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                $sub_item_url = add_query_arg( array( 'page' => $sub_item[2] ), $item[2] );

</span><span class="cx" style="display: block; padding: 0 10px">                                        } else {

</span></span></pre></div>

<a id="trunksrcwpadminmenuphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/menu.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/menu.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/menu.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,7 +60,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> $menu[4] = array( '', 'read', 'separator1', '', 'wp-menu-separator' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// $menu[5] = Posts

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// $menu[5] = Posts.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> $menu[10]                     = array( __( 'Media' ), 'upload_files', 'upload.php', '', 'menu-top menu-icon-media', 'menu-media', 'dashicons-admin-media' );

</span><span class="cx" style="display: block; padding: 0 10px">        $submenu['upload.php'][5] = array( __( 'Library' ), 'upload_files', 'upload.php' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,7 +82,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $submenu['link-manager.php'][10] = array( _x( 'Add New', 'link' ), 'manage_links', 'link-add.php' );

</span><span class="cx" style="display: block; padding: 0 10px">        $submenu['link-manager.php'][15] = array( __( 'Link Categories' ), 'manage_categories', 'edit-tags.php?taxonomy=link_category' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// $menu[20] = Pages

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// $menu[20] = Pages.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px"> // Avoid the comment count query for users who cannot edit_posts.

</span><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( 'edit_posts' ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,7 +107,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> $submenu['edit-comments.php'][0] = array( __( 'All Comments' ), 'edit_posts', 'edit-comments.php' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$_wp_last_object_menu = 25; // The index of the last top-level menu in the object menu group

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$_wp_last_object_menu = 25; // The index of the last top-level menu in the object menu group.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> $types   = (array) get_post_types(

</span><span class="cx" style="display: block; padding: 0 10px">        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -139,7 +139,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $menu_class = 'menu-top menu-icon-' . $ptype_for_id;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // 'post' special case

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // 'post' special case.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( 'post' === $ptype ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $menu_class    .= ' open-if-no-js';

</span><span class="cx" style="display: block; padding: 0 10px">                $ptype_file     = 'edit.php';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -219,7 +219,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">  * @since 3.0.0

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function _add_themes_utility_last() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Must use API on the admin_menu hook, direct modification is only possible on/before the _admin_menu hook

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Must use API on the admin_menu hook, direct modification is only possible on/before the _admin_menu hook.

</ins><span class="cx" style="display: block; padding: 0 10px">         add_submenu_page( 'themes.php', __( 'Theme Editor' ), __( 'Theme Editor' ), 'edit_themes', 'theme-editor.php' );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -297,11 +297,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $submenu['options-general.php'][40] = array( __( 'Permalinks' ), 'manage_options', 'options-permalink.php' );

</span><span class="cx" style="display: block; padding: 0 10px">        $submenu['options-general.php'][45] = array( __( 'Privacy' ), 'manage_privacy_options', 'options-privacy.php' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$_wp_last_utility_menu = 80; // The index of the last top-level menu in the utility menu group

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$_wp_last_utility_menu = 80; // The index of the last top-level menu in the utility menu group.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> $menu[99] = array( '', 'read', 'separator-last', '', 'wp-menu-separator' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Back-compat for old top-levels

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Back-compat for old top-levels.

</ins><span class="cx" style="display: block; padding: 0 10px"> $_wp_real_parent_file['post.php']       = 'edit.php';

</span><span class="cx" style="display: block; padding: 0 10px"> $_wp_real_parent_file['post-new.php']   = 'edit.php';

</span><span class="cx" style="display: block; padding: 0 10px"> $_wp_real_parent_file['edit-pages.php'] = 'edit.php?post_type=page';

</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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/nav-menus.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,7 +12,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> /** Load WordPress Administration Bootstrap */

</span><span class="cx" style="display: block; padding: 0 10px"> require_once( dirname( __FILE__ ) . '/admin.php' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Load all the nav menu interface functions

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Load all the nav menu interface functions.

</ins><span class="cx" style="display: block; padding: 0 10px"> require_once( ABSPATH . 'wp-admin/includes/nav-menu.php' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_theme_supports( 'menus' ) && ! current_theme_supports( 'widgets' ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,7 +19,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        wp_die( __( 'Your theme does not support navigation menus or widgets.' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Permissions Check

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Permissions check.

</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'edit_theme_options' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">        wp_die(

</span><span class="cx" style="display: block; padding: 0 10px">                '<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,21 +34,21 @@

</span><span class="cx" style="display: block; padding: 0 10px">        wp_enqueue_script( 'jquery-touch-punch' );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Container for any messages displayed to the user

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Container for any messages displayed to the user.

</ins><span class="cx" style="display: block; padding: 0 10px"> $messages = array();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Container that stores the name of the active menu

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Container that stores the name of the active menu.

</ins><span class="cx" style="display: block; padding: 0 10px"> $nav_menu_selected_title = '';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// The menu id of the current menu being edited

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// The menu id of the current menu being edited.

</ins><span class="cx" style="display: block; padding: 0 10px"> $nav_menu_selected_id = isset( $_REQUEST['menu'] ) ? (int) $_REQUEST['menu'] : 0;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Get existing menu locations assignments

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Get existing menu locations assignments.

</ins><span class="cx" style="display: block; padding: 0 10px"> $locations      = get_registered_nav_menus();

</span><span class="cx" style="display: block; padding: 0 10px"> $menu_locations = get_nav_menu_locations();

</span><span class="cx" style="display: block; padding: 0 10px"> $num_locations  = count( array_keys( $locations ) );

</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 actions: add, update, delete

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Allowed actions: add, update, delete.

</ins><span class="cx" style="display: block; padding: 0 10px"> $action = isset( $_REQUEST['action'] ) ? $_REQUEST['action'] : 'edit';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> /*

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -325,13 +325,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                                wp_save_nav_menu_items( $nav_menu_selected_id, absint( $_REQUEST['menu-item'] ) );

</span><span class="cx" style="display: block; padding: 0 10px">                                        }

</span><span class="cx" style="display: block; padding: 0 10px">                                        if ( isset( $_REQUEST['zero-menu-state'] ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                // If there are menu items, add them

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         // If there are menu items, add them.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                 wp_nav_menu_update_menu_items( $nav_menu_selected_id, $nav_menu_selected_title );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                // Auto-save nav_menu_locations

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         // Auto-save nav_menu_locations.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                 $locations = get_nav_menu_locations();

</span><span class="cx" style="display: block; padding: 0 10px">                                                foreach ( $locations as $location => $menu_id ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                                $locations[ $location ] = $nav_menu_selected_id;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                                break; // There should only be 1

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                         break; // There should only be 1.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                 }

</span><span class="cx" style="display: block; padding: 0 10px">                                                set_theme_mod( 'nav_menu_locations', $locations );

</span><span class="cx" style="display: block; padding: 0 10px">                                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -399,7 +399,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $new_menu_locations = array_map( 'absint', $_POST['menu-locations'] );

</span><span class="cx" style="display: block; padding: 0 10px">                        $menu_locations     = array_merge( $menu_locations, $new_menu_locations );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Set menu locations

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Set menu locations.

</ins><span class="cx" style="display: block; padding: 0 10px">                         set_theme_mod( 'nav_menu_locations', $menu_locations );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __( 'Menu locations updated.' ) . '</p></div>';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -471,7 +471,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> if ( $one_theme_location_no_menus ) {

</span><span class="cx" style="display: block; padding: 0 10px">        $nav_menu_selected_id = 0;

</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( empty( $nav_menu_selected_id ) && ! empty( $nav_menus ) && ! $add_new_screen ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // if we have no selection yet, and we have menus, set to the first one in the list.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If we have no selection yet, and we have menus, set to the first one in the list.

</ins><span class="cx" style="display: block; padding: 0 10px">         $nav_menu_selected_id = $nav_menus[0]->term_id;

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -536,7 +536,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        ) . '</p></div>';

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( ! $locations_screen ) : // Main tab

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( ! $locations_screen ) : // Main tab.

</ins><span class="cx" style="display: block; padding: 0 10px">         $overview  = '<p>' . __( 'This screen is used for managing your navigation menus.' ) . '</p>';

</span><span class="cx" style="display: block; padding: 0 10px">        $overview .= '<p>' . sprintf(

</span><span class="cx" style="display: block; padding: 0 10px">                /* translators: 1: URL to Widgets screen, 2 and 3: The names of the default themes. */

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -584,7 +584,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'content' => $editing_menus,

</span><span class="cx" style="display: block; padding: 0 10px">                )

</span><span class="cx" style="display: block; padding: 0 10px">        );

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-else : // Locations Tab.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+else : // Locations tab.

</ins><span class="cx" style="display: block; padding: 0 10px">         $locations_overview  = '<p>' . __( 'This screen is used for globally assigning menus to locations defined by your theme.' ) . '</p>';

</span><span class="cx" style="display: block; padding: 0 10px">        $locations_overview .= '<ul><li>' . __( 'To assign menus to one or more theme locations, <strong>select a menu from each location&#8217;s drop down.</strong> When you&#8217;re finished, <strong>click Save Changes</strong>' ) . '</li>';

</span><span class="cx" style="display: block; padding: 0 10px">        $locations_overview .= '<li>' . __( 'To edit a menu currently assigned to a theme location, <strong>click the adjacent &#8217;Edit&#8217; link</strong>' ) . '</li>';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -745,7 +745,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                                        </div><!-- .locations-row-links -->

</span><span class="cx" style="display: block; padding: 0 10px">                                                </td><!-- .menu-location-menus -->

</span><span class="cx" style="display: block; padding: 0 10px">                                        </tr><!-- .menu-locations-row -->

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <?php } // foreach ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <?php } // End foreach. ?>

</ins><span class="cx" style="display: block; padding: 0 10px">                                 </tbody>

</span><span class="cx" style="display: block; padding: 0 10px">                        </table>

</span><span class="cx" style="display: block; padding: 0 10px">                        <p class="button-controls wp-clearfix"><?php submit_button( __( 'Save Changes' ), 'primary left', 'nav-menu-locations', false ); ?></p>

</span></span></pre></div>

<a id="trunksrcwpadminnetworksettingsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/network/settings.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/settings.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/network/settings.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,7 +20,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> $title       = __( 'Network Settings' );

</span><span class="cx" style="display: block; padding: 0 10px"> $parent_file = 'settings.php';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Handle network admin email change requests

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Handle network admin email change requests.

</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $_GET['network_admin_hash'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">        $new_admin_details = get_site_option( 'network_admin_hash' );

</span><span class="cx" style="display: block; padding: 0 10px">        $redirect          = 'settings.php?updated=false';

</span></span></pre></div>

<a id="trunksrcwpadminnetworksitenewphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/network/site-new.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/site-new.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/network/site-new.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,7 +48,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $domain = strtolower( $blog['domain'] );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // If not a subdomain installation, make sure the domain isn't a reserved word

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If not a subdomain installation, make sure the domain isn't a reserved word.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! is_subdomain_install() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $subdirectory_reserved_names = get_subdirectory_reserved_names();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,7 +106,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $password = 'N/A';

</span><span class="cx" style="display: block; padding: 0 10px">        $user_id  = email_exists( $email );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        if ( ! $user_id ) { // Create a new user with a random password

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $user_id ) { // Create a new user with a random password.

</ins><span class="cx" style="display: block; padding: 0 10px">                 /**

<span class="cx" style="display: block; padding: 0 10px">                 * Fires immediately before a new user is created via the network site-new.php page.

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span></span></pre></div>

<a id="trunksrcwpadminnetworksitesettingsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/network/site-settings.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/site-settings.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/network/site-settings.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,7 +44,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $key = wp_unslash( $key );

</span><span class="cx" style="display: block; padding: 0 10px">                $val = wp_unslash( $val );

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $key === 0 || is_array( $val ) || in_array( $key, $skip_options ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        continue; // Avoids "0 is a protected WP option and may not be modified" error when edit blog options

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 continue; // Avoids "0 is a protected WP option and may not be modified" error when edit blog options.

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( $key, $val );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -157,7 +157,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                </tr>

</span><span class="cx" style="display: block; padding: 0 10px">                                <?php

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                } // End foreach

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         } // End foreach.

</ins><span class="cx" style="display: block; padding: 0 10px">                 /**

<span class="cx" style="display: block; padding: 0 10px">                 * Fires at the end of the Edit Site form, before the submit button.

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span></span></pre></div>

<a id="trunksrcwpadminnetworkthemesphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/network/themes.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/themes.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/network/themes.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -177,7 +177,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                <?php

</span><span class="cx" style="display: block; padding: 0 10px">                                require_once( ABSPATH . 'wp-admin/admin-footer.php' );

</span><span class="cx" style="display: block; padding: 0 10px">                                exit;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        } // Endif verify-delete

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 } // End if verify-delete.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        foreach ( $themes as $theme ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $delete_result = delete_theme(

</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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/network/users.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,7 +28,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $id = intval( $_GET['id'] );

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( $id != '0' && $id != '1' ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $_POST['allusers'] = array( $id ); // confirm_delete_users() can only handle with arrays

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $_POST['allusers'] = array( $id ); // confirm_delete_users() can only handle arrays.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $title             = __( 'Users' );

</span><span class="cx" style="display: block; padding: 0 10px">                                $parent_file       = 'users.php';

</span><span class="cx" style="display: block; padding: 0 10px">                                require_once( ABSPATH . 'wp-admin/admin-header.php' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,7 +84,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                                                $blogs        = get_blogs_of_user( $user_id, true );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                                                foreach ( (array) $blogs as $details ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                                        if ( $details->userblog_id != get_network()->site_id ) { // main blog not a spam !

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                                 if ( $details->userblog_id != get_network()->site_id ) { // Main blog is not a spam!

</ins><span class="cx" style="display: block; padding: 0 10px">                                                                                 update_blog_status( $details->userblog_id, 'spam', '1' );

</span><span class="cx" style="display: block; padding: 0 10px">                                                                        }

</span><span class="cx" style="display: block; padding: 0 10px">                                                                }

</span></span></pre></div>

<a id="trunksrcwpadminoptionsdiscussionphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/options-discussion.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/options-discussion.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/options-discussion.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -220,7 +220,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'An avatar is an image that follows you from weblog to weblog appearing beside your name when you comment on avatar enabled sites. Here you can enable the display of avatars for people who comment on your site.' ); ?></p>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> <?php

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// the above would be a good place to link to codex documentation on the gravatar functions, for putting it in themes. anything like that?

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// The above would be a good place to link to the documentation on the Gravatar functions, for putting it in themes. Anything like that?

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> $show_avatars       = get_option( 'show_avatars' );

</span><span class="cx" style="display: block; padding: 0 10px"> $show_avatars_class = '';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -294,7 +294,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> $default         = get_option( 'avatar_default', 'mystery' );

</span><span class="cx" style="display: block; padding: 0 10px"> $avatar_list     = '';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Force avatars on to display these choices

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Force avatars on to display these choices.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'pre_option_show_avatars', '__return_true', 100 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $avatar_defaults as $default_key => $default_name ) {

</span></span></pre></div>

<a id="trunksrcwpadminoptionsgeneralphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/options-general.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/options-general.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/options-general.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -209,7 +209,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $tzstring = '';

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( empty( $tzstring ) ) { // Create a UTC+- zone if no timezone string exists

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( empty( $tzstring ) ) { // Create a UTC+- zone if no timezone string exists.

</ins><span class="cx" style="display: block; padding: 0 10px">         $check_zone_info = false;

</span><span class="cx" style="display: block; padding: 0 10px">        if ( 0 == $current_offset ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $tzstring = 'UTC+0';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -321,7 +321,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $date_formats as $format ) {

</span><span class="cx" style="display: block; padding: 0 10px">        echo "\t<label><input type='radio' name='date_format' value='" . esc_attr( $format ) . "'";

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        if ( get_option( 'date_format' ) === $format ) { // checked() uses "==" rather than "==="

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_option( 'date_format' ) === $format ) { // checked() uses "==" rather than "===".

</ins><span class="cx" style="display: block; padding: 0 10px">                 echo " checked='checked'";

</span><span class="cx" style="display: block; padding: 0 10px">                $custom = false;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -358,7 +358,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $time_formats as $format ) {

</span><span class="cx" style="display: block; padding: 0 10px">        echo "\t<label><input type='radio' name='time_format' value='" . esc_attr( $format ) . "'";

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        if ( get_option( 'time_format' ) === $format ) { // checked() uses "==" rather than "==="

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_option( 'time_format' ) === $format ) { // checked() uses "==" rather than "===".

</ins><span class="cx" style="display: block; padding: 0 10px">                 echo " checked='checked'";

</span><span class="cx" style="display: block; padding: 0 10px">                $custom = false;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span></span></pre></div>

<a id="trunksrcwpadminoptionsmediaphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/options-media.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/options-media.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/options-media.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,7 +107,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> <h2 class="title"><?php _e( 'Uploading Files' ); ?></h2>

</span><span class="cx" style="display: block; padding: 0 10px"> <table class="form-table" role="presentation">

</span><span class="cx" style="display: block; padding: 0 10px">        <?php

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // If upload_url_path is not the default (empty), and upload_path is not the default ('wp-content/uploads' or empty)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If upload_url_path is not the default (empty), and upload_path is not the default ('wp-content/uploads' or empty).

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( get_option( 'upload_url_path' ) || ( get_option( 'upload_path' ) != 'wp-content/uploads' && get_option( 'upload_path' ) ) ) :

</span><span class="cx" style="display: block; padding: 0 10px">                ?>

</span><span class="cx" style="display: block; padding: 0 10px"> <tr>

</span></span></pre></div>

<a id="trunksrcwpadminoptionspermalinkphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/options-permalink.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/options-permalink.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/options-permalink.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -419,7 +419,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> </form>

</span><span class="cx" style="display: block; padding: 0 10px">        <?php endif; ?>

</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php } // multisite ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php } // End if ! is_multisite(). ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> </div>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunksrcwpadminoptionsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/options.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/options.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/options.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,7 +52,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Handle admin email change requests

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Handle admin email change requests.

</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $_GET['adminhash'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">        $new_admin_details = get_option( 'adminhash' );

</span><span class="cx" style="display: block; padding: 0 10px">        $redirect          = 'options-general.php?updated=false';

</span></span></pre></div>

<a id="trunksrcwpadminplugineditorphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/plugin-editor.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/plugin-editor.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/plugin-editor.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -79,6 +79,7 @@

<span class="cx" style="display: block; padding: 0 10px"> // Handle fallback editing of file when JavaScript is not available.

</span><span class="cx" style="display: block; padding: 0 10px"> $edit_error     = null;

</span><span class="cx" style="display: block; padding: 0 10px"> $posted_content = null;

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'POST' === $_SERVER['REQUEST_METHOD'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">        $r = wp_edit_theme_plugin_file( wp_unslash( $_POST ) );

</span><span class="cx" style="display: block; padding: 0 10px">        if ( is_wp_error( $r ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -101,16 +102,16 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // List of allowable extensions

-       $editable_extensions = wp_get_plugin_file_editable_extensions( $plugin );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// List of allowable extensions.

+$editable_extensions = wp_get_plugin_file_editable_extensions( $plugin );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_file( $real_file ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">        wp_die( sprintf( '<p>%s</p>', __( 'File does not exist! Please double check the name and try again.' ) ) );

</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">-        // Get the extension of the file

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Get the extension of the file.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( preg_match( '/\.([^.]+)$/', $real_file, $matches ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $ext = strtolower( $matches[1] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If extension is not in the acceptable list, skip it

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If extension is not in the acceptable list, skip it.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! in_array( $ext, $editable_extensions ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        wp_die( sprintf( '<p>%s</p>', __( 'Files of this type are not editable.' ) ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -117,64 +118,64 @@

</span><span class="cx" style="display: 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">-        get_current_screen()->add_help_tab(

-               array(

-                       'id'      => 'overview',

-                       'title'   => __( 'Overview' ),

-                       'content' =>

-                                       '<p>' . __( 'You can use the plugin editor to make changes to any of your plugins&#8217; individual PHP files. Be aware that if you make changes, plugins updates will overwrite your customizations.' ) . '</p>' .

-                                       '<p>' . __( 'Choose a plugin to edit from the dropdown menu and click the Select button. Click once on any file name to load it in the editor, and make your changes. Don&#8217;t forget to save your changes (Update File) when you&#8217;re finished.' ) . '</p>' .

-                                       '<p>' . __( 'The Documentation menu below the editor lists the PHP functions recognized in the plugin file. Clicking Look Up takes you to a web page about that particular function.' ) . '</p>' .

-                                       '<p id="editor-keyboard-trap-help-1">' . __( 'When using a keyboard to navigate:' ) . '</p>' .

-                                       '<ul>' .

-                                       '<li id="editor-keyboard-trap-help-2">' . __( 'In the editing area, the Tab key enters a tab character.' ) . '</li>' .

-                                       '<li id="editor-keyboard-trap-help-3">' . __( 'To move away from this area, press the Esc key followed by the Tab key.' ) . '</li>' .

-                                       '<li id="editor-keyboard-trap-help-4">' . __( 'Screen reader users: when in forms mode, you may need to press the Esc key twice.' ) . '</li>' .

-                                       '</ul>' .

-                                       '<p>' . __( 'If you want to make changes but don&#8217;t want them to be overwritten when the plugin is updated, you may be ready to think about writing your own plugin. For information on how to edit plugins, write your own from scratch, or just better understand their anatomy, check out the links below.' ) . '</p>' .

-                                       ( is_network_admin() ? '<p>' . __( 'Any edits to files from this screen will be reflected on all sites in the network.' ) . '</p>' : '' ),

-               )

-       );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+get_current_screen()->add_help_tab(

+       array(

+               'id'      => 'overview',

+               'title'   => __( 'Overview' ),

+               'content' =>

+                               '<p>' . __( 'You can use the plugin editor to make changes to any of your plugins&#8217; individual PHP files. Be aware that if you make changes, plugins updates will overwrite your customizations.' ) . '</p>' .

+                               '<p>' . __( 'Choose a plugin to edit from the dropdown menu and click the Select button. Click once on any file name to load it in the editor, and make your changes. Don&#8217;t forget to save your changes (Update File) when you&#8217;re finished.' ) . '</p>' .

+                               '<p>' . __( 'The Documentation menu below the editor lists the PHP functions recognized in the plugin file. Clicking Look Up takes you to a web page about that particular function.' ) . '</p>' .

+                               '<p id="editor-keyboard-trap-help-1">' . __( 'When using a keyboard to navigate:' ) . '</p>' .

+                               '<ul>' .

+                               '<li id="editor-keyboard-trap-help-2">' . __( 'In the editing area, the Tab key enters a tab character.' ) . '</li>' .

+                               '<li id="editor-keyboard-trap-help-3">' . __( 'To move away from this area, press the Esc key followed by the Tab key.' ) . '</li>' .

+                               '<li id="editor-keyboard-trap-help-4">' . __( 'Screen reader users: when in forms mode, you may need to press the Esc key twice.' ) . '</li>' .

+                               '</ul>' .

+                               '<p>' . __( 'If you want to make changes but don&#8217;t want them to be overwritten when the plugin is updated, you may be ready to think about writing your own plugin. For information on how to edit plugins, write your own from scratch, or just better understand their anatomy, check out the links below.' ) . '</p>' .

+                               ( is_network_admin() ? '<p>' . __( 'Any edits to files from this screen will be reflected on all sites in the network.' ) . '</p>' : '' ),

+       )

+);

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        get_current_screen()->set_help_sidebar(

-               '<p><strong>' . __( 'For more information:' ) . '</strong></p>' .

-               '<p>' . __( '<a href="https://wordpress.org/support/article/plugins-editor-screen/">Documentation on Editing Plugins</a>' ) . '</p>' .

-               '<p>' . __( '<a href="https://developer.wordpress.org/plugins/">Documentation on Writing Plugins</a>' ) . '</p>' .

-               '<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'

-       );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+get_current_screen()->set_help_sidebar(

+       '<p><strong>' . __( 'For more information:' ) . '</strong></p>' .

+       '<p>' . __( '<a href="https://wordpress.org/support/article/plugins-editor-screen/">Documentation on Editing Plugins</a>' ) . '</p>' .

+       '<p>' . __( '<a href="https://developer.wordpress.org/plugins/">Documentation on Writing Plugins</a>' ) . '</p>' .

+       '<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'

+);

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $settings = array(

-               'codeEditor' => wp_enqueue_code_editor( array( 'file' => $real_file ) ),

-       );

-       wp_enqueue_script( 'wp-theme-plugin-editor' );

-       wp_add_inline_script( 'wp-theme-plugin-editor', sprintf( 'jQuery( function( $ ) { wp.themePluginEditor.init( $( "#template" ), %s ); } )', wp_json_encode( $settings ) ) );

-       wp_add_inline_script( 'wp-theme-plugin-editor', sprintf( 'wp.themePluginEditor.themeOrPlugin = "plugin";' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$settings = array(

+       'codeEditor' => wp_enqueue_code_editor( array( 'file' => $real_file ) ),

+);

+wp_enqueue_script( 'wp-theme-plugin-editor' );

+wp_add_inline_script( 'wp-theme-plugin-editor', sprintf( 'jQuery( function( $ ) { wp.themePluginEditor.init( $( "#template" ), %s ); } )', wp_json_encode( $settings ) ) );

+wp_add_inline_script( 'wp-theme-plugin-editor', sprintf( 'wp.themePluginEditor.themeOrPlugin = "plugin";' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        require_once( ABSPATH . 'wp-admin/admin-header.php' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+require_once( ABSPATH . 'wp-admin/admin-header.php' );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        update_recently_edited( WP_PLUGIN_DIR . '/' . $file );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+update_recently_edited( WP_PLUGIN_DIR . '/' . $file );

</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 ( ! empty( $posted_content ) ) {

-               $content = $posted_content;

-       } else {

-               $content = file_get_contents( $real_file );

-       }

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( ! empty( $posted_content ) ) {

+       $content = $posted_content;

+} else {

+       $content = file_get_contents( $real_file );

+}

</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 ( '.php' == substr( $real_file, strrpos( $real_file, '.' ) ) ) {

-               $functions = wp_doc_link_parse( $content );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( '.php' == substr( $real_file, strrpos( $real_file, '.' ) ) ) {

+       $functions = wp_doc_link_parse( $content );

</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 ( ! empty( $functions ) ) {

-                       $docs_select  = '<select name="docs-list" id="docs-list">';

-                       $docs_select .= '<option value="">' . __( 'Function Name&hellip;' ) . '</option>';

-                       foreach ( $functions as $function ) {

-                               $docs_select .= '<option value="' . esc_attr( $function ) . '">' . esc_html( $function ) . '()</option>';

-                       }

-                       $docs_select .= '</select>';

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $functions ) ) {

+               $docs_select  = '<select name="docs-list" id="docs-list">';

+               $docs_select .= '<option value="">' . __( 'Function Name&hellip;' ) . '</option>';

+               foreach ( $functions as $function ) {

+                       $docs_select .= '<option value="' . esc_attr( $function ) . '">' . esc_html( $function ) . '()</option>';

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                $docs_select .= '</select>';

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+}

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $content = esc_textarea( $content );

-       ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$content = esc_textarea( $content );

+?>

</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="wrap">

</span><span class="cx" style="display: block; padding: 0 10px"> <h1><?php echo esc_html( $title ); ?></h1>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -217,19 +218,19 @@

</span><span class="cx" style="display: block; padding: 0 10px">        <form action="plugin-editor.php" method="get">

</span><span class="cx" style="display: block; padding: 0 10px">                <strong><label for="plugin"><?php _e( 'Select plugin to edit:' ); ?> </label></strong>

</span><span class="cx" style="display: block; padding: 0 10px">                <select name="plugin" id="plugin">

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php

-foreach ( $plugins as $plugin_key => $a_plugin ) {

-       $plugin_name = $a_plugin['Name'];

-       if ( $plugin_key == $plugin ) {

-               $selected = " selected='selected'";

-       } else {

-               $selected = '';

-       }

-       $plugin_name = esc_attr( $plugin_name );

-       $plugin_key  = esc_attr( $plugin_key );

-       echo "\n\t<option value=\"$plugin_key\" $selected>$plugin_name</option>";

-}

-?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <?php

+               foreach ( $plugins as $plugin_key => $a_plugin ) {

+                       $plugin_name = $a_plugin['Name'];

+                       if ( $plugin_key == $plugin ) {

+                               $selected = " selected='selected'";

+                       } else {

+                               $selected = '';

+                       }

+                       $plugin_name = esc_attr( $plugin_name );

+                       $plugin_key  = esc_attr( $plugin_key );

+                       echo "\n\t<option value=\"$plugin_key\" $selected>$plugin_name</option>";

+               }

+               ?>

</ins><span class="cx" style="display: block; padding: 0 10px">                 </select>

</span><span class="cx" style="display: block; padding: 0 10px">                <?php submit_button( __( 'Select' ), '', 'Submit', false ); ?>

</span><span class="cx" style="display: block; padding: 0 10px">        </form>

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -255,42 +256,50 @@

</span><span class="cx" style="display: block; padding: 0 10px">                </ul>

</span><span class="cx" style="display: block; padding: 0 10px">        </ul>

</span><span class="cx" style="display: block; padding: 0 10px"> </div>

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px"> <form name="template" id="template" action="plugin-editor.php" method="post">

</span><span class="cx" style="display: block; padding: 0 10px">        <?php wp_nonce_field( 'edit-plugin_' . $file, 'nonce' ); ?>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <div>

-                       <label for="newcontent" id="theme-plugin-editor-label"><?php _e( 'Selected file content:' ); ?></label>

-                       <textarea cols="70" rows="25" name="newcontent" id="newcontent" aria-describedby="editor-keyboard-trap-help-1 editor-keyboard-trap-help-2 editor-keyboard-trap-help-3 editor-keyboard-trap-help-4"><?php echo $content; ?></textarea>

-                       <input type="hidden" name="action" value="update" />

-                       <input type="hidden" name="file" value="<?php echo esc_attr( $file ); ?>" />

-                       <input type="hidden" name="plugin" value="<?php echo esc_attr( $plugin ); ?>" />

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div>

+               <label for="newcontent" id="theme-plugin-editor-label"><?php _e( 'Selected file content:' ); ?></label>

+               <textarea cols="70" rows="25" name="newcontent" id="newcontent" aria-describedby="editor-keyboard-trap-help-1 editor-keyboard-trap-help-2 editor-keyboard-trap-help-3 editor-keyboard-trap-help-4"><?php echo $content; ?></textarea>

+               <input type="hidden" name="action" value="update" />

+               <input type="hidden" name="file" value="<?php echo esc_attr( $file ); ?>" />

+               <input type="hidden" name="plugin" value="<?php echo esc_attr( $plugin ); ?>" />

+       </div>

+

+       <?php if ( ! empty( $docs_select ) ) : ?>

+               <div id="documentation" class="hide-if-no-js">

+                       <label for="docs-list"><?php _e( 'Documentation:' ); ?></label>

+                       <?php echo $docs_select; ?>

+                       <input disabled id="docs-lookup" type="button" class="button" value="<?php esc_attr_e( 'Look Up' ); ?>" onclick="if ( '' != jQuery('#docs-list').val() ) { window.open( 'https://api.wordpress.org/core/handbook/1.0/?function=' + escape( jQuery( '#docs-list' ).val() ) + '&amp;locale=<?php echo urlencode( get_user_locale() ); ?>&amp;version=<?php echo urlencode( get_bloginfo( 'version' ) ); ?>&amp;redirect=true'); }" />

</ins><span class="cx" style="display: block; padding: 0 10px">                 </div>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <?php if ( ! empty( $docs_select ) ) : ?>

-               <div id="documentation" class="hide-if-no-js"><label for="docs-list"><?php _e( 'Documentation:' ); ?></label> <?php echo $docs_select; ?> <input disabled id="docs-lookup" type="button" class="button" value="<?php esc_attr_e( 'Look Up' ); ?> " onclick="if ( '' != jQuery('#docs-list').val() ) { window.open( 'https://api.wordpress.org/core/handbook/1.0/?function=' + escape( jQuery( '#docs-list' ).val() ) + '&amp;locale=<?php echo urlencode( get_user_locale() ); ?>&amp;version=<?php echo urlencode( get_bloginfo( 'version' ) ); ?>&amp;redirect=true'); }" /></div>

-               <?php endif; ?>

-<?php if ( is_writeable( $real_file ) ) : ?>

-       <div class="editor-notices">

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php endif; ?>

+

+       <?php if ( is_writeable( $real_file ) ) : ?>

+               <div class="editor-notices">

</ins><span class="cx" style="display: block; padding: 0 10px">                 <?php if ( in_array( $plugin, (array) get_option( 'active_plugins', array() ) ) ) { ?>

</span><span class="cx" style="display: block; padding: 0 10px">                        <div class="notice notice-warning inline active-plugin-edit-warning">

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <p><?php _e( '<strong>Warning:</strong> Making changes to active plugins is not recommended.' ); ?></p>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <p><?php _e( '<strong>Warning:</strong> Making changes to active plugins is not recommended.' ); ?></p>

+                       </div>

+               <?php } ?>

</ins><span class="cx" style="display: block; padding: 0 10px">                 </div>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <?php } ?>

-       </div>

-       <p class="submit">

-               <?php submit_button( __( 'Update File' ), 'primary', 'submit', false ); ?>

-               <span class="spinner"></span>

-       </p>

-<?php else : ?>

-       <p><em>

-               <?php

-               printf(

-                       /* translators: %s: Documentation URL. */

-                       __( 'You need to make this file writable before you can save your changes. See <a href="%s">Changing File Permissions</a> for more information.' ),

-                       __( 'https://wordpress.org/support/article/changing-file-permissions/' )

-               );

-               ?>

-       </em></p>

-<?php endif; ?>

-<?php wp_print_file_editor_templates(); ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <p class="submit">

+                       <?php submit_button( __( 'Update File' ), 'primary', 'submit', false ); ?>

+                       <span class="spinner"></span>

+               </p>

+       <?php else : ?>

+               <p><em>

+                       <?php

+                       printf(

+                               /* translators: %s: Documentation URL. */

+                               __( 'You need to make this file writable before you can save your changes. See <a href="%s">Changing File Permissions</a> for more information.' ),

+                               __( 'https://wordpress.org/support/article/changing-file-permissions/' )

+                       );

+                       ?>

+               </em></p>

+       <?php endif; ?>

+

+       <?php wp_print_file_editor_templates(); ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> </form>

</span><span class="cx" style="display: block; padding: 0 10px"> <br class="clear" />

</span><span class="cx" style="display: block; padding: 0 10px"> </div>

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -297,8 +306,9 @@

</span><span class="cx" style="display: block; padding: 0 10px"> <?php

</span><span class="cx" style="display: block; padding: 0 10px"> $dismissed_pointers = explode( ',', (string) get_user_meta( get_current_user_id(), 'dismissed_wp_pointers', true ) );

</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! in_array( 'plugin_editor_notice', $dismissed_pointers, true ) ) :

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Get a back URL

-       $referer                    = wp_get_referer();

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Get a back URL.

+       $referer = wp_get_referer();

+

</ins><span class="cx" style="display: block; padding: 0 10px">         $excluded_referer_basenames = array( 'plugin-editor.php', 'wp-login.php' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( $referer && ! in_array( basename( parse_url( $referer, PHP_URL_PATH ) ), $excluded_referer_basenames, true ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -307,22 +317,22 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $return_url = admin_url( '/' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px">        ?>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<div id="file-editor-warning" class="notification-dialog-wrap file-editor-warning hide-if-no-js hidden">

-       <div class="notification-dialog-background"></div>

-       <div class="notification-dialog">

-               <div class="file-editor-warning-content">

-                       <div class="file-editor-warning-message">

-                               <h1><?php _e( 'Heads up!' ); ?></h1>

-                               <p><?php _e( 'You appear to be making direct edits to your plugin in the WordPress dashboard. We recommend that you don&#8217;t! Editing plugins directly may introduce incompatibilities that break your site and your changes may be lost in future updates.' ); ?></p>

-                               <p><?php _e( 'If you absolutely have to make direct edits to this plugin, use a file manager to create a copy with a new name and hang on to the original. That way, you can re-enable a functional version if something goes wrong.' ); ?></p>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div id="file-editor-warning" class="notification-dialog-wrap file-editor-warning hide-if-no-js hidden">

+               <div class="notification-dialog-background"></div>

+               <div class="notification-dialog">

+                       <div class="file-editor-warning-content">

+                               <div class="file-editor-warning-message">

+                                       <h1><?php _e( 'Heads up!' ); ?></h1>

+                                       <p><?php _e( 'You appear to be making direct edits to your plugin in the WordPress dashboard. We recommend that you don&#8217;t! Editing plugins directly may introduce incompatibilities that break your site and your changes may be lost in future updates.' ); ?></p>

+                                       <p><?php _e( 'If you absolutely have to make direct edits to this plugin, use a file manager to create a copy with a new name and hang on to the original. That way, you can re-enable a functional version if something goes wrong.' ); ?></p>

+                               </div>

+                               <p>

+                                       <a class="button file-editor-warning-go-back" href="<?php echo esc_url( $return_url ); ?>"><?php _e( 'Go back' ); ?></a>

+                                       <button type="button" class="file-editor-warning-dismiss button button-primary"><?php _e( 'I understand' ); ?></button>

+                               </p>

</ins><span class="cx" style="display: block; padding: 0 10px">                         </div>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <p>

-                               <a class="button file-editor-warning-go-back" href="<?php echo esc_url( $return_url ); ?>"><?php _e( 'Go back' ); ?></a>

-                               <button type="button" class="file-editor-warning-dismiss button button-primary"><?php _e( 'I understand' ); ?></button>

-                       </p>

</del><span class="cx" style="display: block; padding: 0 10px">                 </div>

</span><span class="cx" style="display: block; padding: 0 10px">        </div>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-</div>

</del><span class="cx" style="display: block; padding: 0 10px">         <?php

<span class="cx" style="display: block; padding: 0 10px"> endif; // Editor warning notice.

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunksrcwpadminplugininstallphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/plugin-install.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/plugin-install.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/plugin-install.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,7 +5,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">  * @package WordPress

</span><span class="cx" style="display: block; padding: 0 10px">  * @subpackage Administration

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// TODO route this pages via a specific iframe handler instead of the do_action below

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// TODO: Route this page via a specific iframe handler instead of the do_action below.

</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! defined( 'IFRAME_REQUEST' ) && isset( $_GET['tab'] ) && ( 'plugin-information' == $_GET['tab'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">        define( 'IFRAME_REQUEST', true );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span></span></pre></div>

<a id="trunksrcwpadminpluginsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/plugins.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/plugins.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/plugins.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -63,11 +63,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( isset( $_GET['from'] ) && 'import' == $_GET['from'] ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                wp_redirect( self_admin_url( 'import.php?import=' . str_replace( '-importer', '', dirname( $plugin ) ) ) ); // overrides the ?error=true one above and redirects to the Imports page, stripping the -importer suffix

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Overrides the ?error=true one above and redirects to the Imports page, stripping the -importer suffix.

+                               wp_redirect( self_admin_url( 'import.php?import=' . str_replace( '-importer', '', dirname( $plugin ) ) ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                         } elseif ( isset( $_GET['from'] ) && 'press-this' == $_GET['from'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                wp_redirect( self_admin_url( 'press-this.php' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        } else {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                wp_redirect( self_admin_url( "plugins.php?activate=true&plugin_status=$status&paged=$page&s=$s" ) ); // overrides the ?error=true one above

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Overrides the ?error=true one above.

+                               wp_redirect( self_admin_url( "plugins.php?activate=true&plugin_status=$status&paged=$page&s=$s" ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                         }

</span><span class="cx" style="display: block; padding: 0 10px">                        exit;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -170,8 +172,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                error_reporting( E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        ini_set( 'display_errors', true ); //Ensure that Fatal errors are displayed.

-                       // Go back to "sandbox" scope so we get the same errors as before

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 ini_set( 'display_errors', true ); // Ensure that fatal errors are displayed.

+                       // Go back to "sandbox" scope so we get the same errors as before.

</ins><span class="cx" style="display: block; padding: 0 10px">                         plugin_sandbox_scrape( $plugin );

</span><span class="cx" style="display: block; padding: 0 10px">                        /** This action is documented in wp-admin/includes/plugin.php */

</span><span class="cx" style="display: block; padding: 0 10px">                        do_action( "activate_{$plugin}" );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -254,7 +256,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        check_admin_referer( 'bulk-plugins' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        //$_POST = from the plugin form; $_GET = from the FTP details screen.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // $_POST = from the plugin form; $_GET = from the FTP details screen.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $plugins = isset( $_REQUEST['checked'] ) ? (array) wp_unslash( $_REQUEST['checked'] ) : array();

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( empty( $plugins ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                wp_redirect( self_admin_url( "plugins.php?plugin_status=$status&paged=$page&s=$s" ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -261,7 +263,7 @@

</span><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"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $plugins = array_filter( $plugins, 'is_plugin_inactive' ); // Do not allow to delete Activated plugins.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $plugins = array_filter( $plugins, 'is_plugin_inactive' ); // Do not allow to delete activated plugins.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( empty( $plugins ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                wp_redirect( self_admin_url( "plugins.php?error=true&main=true&plugin_status=$status&paged=$page&s=$s" ) );

</span><span class="cx" style="display: block; padding: 0 10px">                                exit;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -268,7 +270,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                        // Bail on all if any paths are invalid.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // validate_file() returns truthy for invalid files

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // validate_file() returns truthy for invalid files.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $invalid_plugin_files = array_filter( $plugins, 'validate_file' );

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( $invalid_plugin_files ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                wp_redirect( self_admin_url( "plugins.php?plugin_status=$status&paged=$page&s=$s" ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -375,11 +377,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                exit;

</span><span class="cx" style="display: block; padding: 0 10px">                        } else {

</span><span class="cx" style="display: block; padding: 0 10px">                                $plugins_to_delete = count( $plugins );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        } // endif verify-delete

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 } // End if verify-delete.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $delete_result = delete_plugins( $plugins );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        set_transient( 'plugins_delete_result_' . $user_ID, $delete_result ); //Store the result in a cache rather than a URL param due to object type & length

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Store the result in a cache rather than a URL param due to object type & length.

+                       set_transient( 'plugins_delete_result_' . $user_ID, $delete_result );

</ins><span class="cx" style="display: block; padding: 0 10px">                         wp_redirect( self_admin_url( "plugins.php?deleted=$plugins_to_delete&plugin_status=$status&paged=$page&s=$s" ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        exit;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -420,7 +423,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                $plugins  = isset( $_POST['checked'] ) ? (array) wp_unslash( $_POST['checked'] ) : array();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                /** This action is documented in wp-admin/edit.php */

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $sendback = apply_filters( "handle_bulk_actions-{$screen}", $sendback, $action, $plugins );  // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $sendback = apply_filters( "handle_bulk_actions-{$screen}", $sendback, $action, $plugins ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores

</ins><span class="cx" style="display: block; padding: 0 10px">                                 wp_safe_redirect( $sendback );

</span><span class="cx" style="display: block; padding: 0 10px">                                exit;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span></span></pre></div>

<a id="trunksrcwpadminpostnewphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/post-new.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/post-new.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/post-new.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,10 +39,10 @@

<span class="cx" style="display: block; padding: 0 10px">                // What if there isn't a post-new.php item for this post type?

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! isset( $_registered_pages[ get_plugin_page_hookname( "post-new.php?post_type=$post_type", $post_type_object->show_in_menu ) ] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( isset( $_registered_pages[ get_plugin_page_hookname( "edit.php?post_type=$post_type", $post_type_object->show_in_menu ) ] ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Fall back to edit.php for that post type, if it exists

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Fall back to edit.php for that post type, if it exists.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $submenu_file = "edit.php?post_type=$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">-                                // Otherwise, give up and highlight the parent

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Otherwise, give up and highlight the parent.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $submenu_file = $parent_file;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span></span></pre></div>

<a id="trunksrcwpadminpostphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/post.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/post.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/post.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,11 +71,11 @@

</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 'post-quickdraft-save':

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check nonce and capabilities

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check nonce and capabilities.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $nonce     = $_REQUEST['_wpnonce'];

</span><span class="cx" style="display: block; padding: 0 10px">                $error_msg = 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">-                // For output of the quickdraft dashboard widget

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // For output of the Quick Draft dashboard widget.

</ins><span class="cx" style="display: block; padding: 0 10px">                 require_once ABSPATH . 'wp-admin/includes/dashboard.php';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! wp_verify_nonce( $nonce, 'add-post' ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -202,11 +202,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">        case 'editattachment':

</span><span class="cx" style="display: block; padding: 0 10px">                check_admin_referer( 'update-post_' . $post_id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Don't let these be changed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Don't let these be changed.

</ins><span class="cx" style="display: block; padding: 0 10px">                 unset( $_POST['guid'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['post_type'] = '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">-                // Update the thumbnail filename

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Update the thumbnail filename.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $newmeta          = wp_get_attachment_metadata( $post_id, true );

</span><span class="cx" style="display: block; padding: 0 10px">                $newmeta['thumb'] = wp_basename( $_POST['thumb'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -218,12 +218,12 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $post_id = edit_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">-                // Session cookie flag that the post was saved

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Session cookie flag that the post was saved.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( isset( $_COOKIE['wp-saving-post'] ) && $_COOKIE['wp-saving-post'] === $post_id . '-check' ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        setcookie( 'wp-saving-post', $post_id . '-saved', time() + DAY_IN_SECONDS, ADMIN_COOKIE_PATH, COOKIE_DOMAIN, is_ssl() );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                redirect_post( $post_id ); // Send user on their way while we keep working

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         redirect_post( $post_id ); // Send user on their way while we keep working.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                exit();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -349,5 +349,5 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                wp_redirect( admin_url( 'edit.php' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                exit();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-} // end switch

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+} // End switch.

</ins><span class="cx" style="display: block; padding: 0 10px"> include( ABSPATH . 'wp-admin/admin-footer.php' );

</span></span></pre></div>

<a id="trunksrcwpadminrevisionphp"></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/revision.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/revision.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/revision.php     2020-01-29 00:43:23 UTC (rev 47122)

</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">                        break;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Don't allow revision restore when post is locked

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Don't allow revision restore when post is locked.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( wp_check_post_lock( $post->ID ) ) {

</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">@@ -86,7 +86,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        break;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Revisions disabled and we're not looking at an autosave

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Revisions disabled and we're not looking at an autosave.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! wp_revisions_enabled( $post ) && ! wp_is_post_autosave( $revision ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $redirect = 'edit.php?post_type=' . $post->post_type;

</span><span class="cx" style="display: block; padding: 0 10px">                        break;

</span></span></pre></div>

<a id="trunksrcwpadminsetupconfigphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/setup-config.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/setup-config.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/setup-config.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -55,7 +55,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Check if wp-config.php has been created

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Check if wp-config.php has been created.

</ins><span class="cx" style="display: block; padding: 0 10px"> if ( file_exists( ABSPATH . 'wp-config.php' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">        wp_die(

</span><span class="cx" style="display: block; padding: 0 10px">                '<p>' . sprintf(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,7 +67,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">-// Check if wp-config.php exists above the root directory but is not part of another installation

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Check if wp-config.php exists above the root directory but is not part of another installation.

</ins><span class="cx" style="display: block; padding: 0 10px"> if ( @file_exists( ABSPATH . '../wp-config.php' ) && ! @file_exists( ABSPATH . '../wp-settings.php' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">        wp_die(

</span><span class="cx" style="display: block; padding: 0 10px">                '<p>' . sprintf(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,7 +115,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> <body class="<?php echo implode( ' ', $body_classes ); ?>">

</span><span class="cx" style="display: block; padding: 0 10px"> <p id="logo"><a href="<?php echo esc_url( __( 'https://wordpress.org/' ) ); ?>"><?php _e( 'WordPress' ); ?></a></p>

</span><span class="cx" style="display: block; padding: 0 10px">        <?php

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-} // end function setup_config_display_header();

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+} // End function setup_config_display_header();

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> $language = '';

</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $_REQUEST['language'] ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -286,7 +286,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        wp_die( __( '<strong>ERROR</strong>: "Table Prefix" can only contain numbers, letters, and underscores.' ) . $tryagain_link );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test the db connection.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test the DB connection.

</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">                 * @ignore

</span></span></pre></div>

<a id="trunksrcwpadminthemeeditorphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/theme-editor.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/theme-editor.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/theme-editor.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -117,6 +117,7 @@

<span class="cx" style="display: block; padding: 0 10px"> // Handle fallback editing of file when JavaScript is not available.

</span><span class="cx" style="display: block; padding: 0 10px"> $edit_error     = null;

</span><span class="cx" style="display: block; padding: 0 10px"> $posted_content = null;

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'POST' === $_SERVER['REQUEST_METHOD'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">        $r = wp_edit_theme_plugin_file( wp_unslash( $_POST ) );

</span><span class="cx" style="display: block; padding: 0 10px">        if ( is_wp_error( $r ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -139,49 +140,49 @@

</span><span class="cx" style="display: 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">-        $settings = array(

-               'codeEditor' => wp_enqueue_code_editor( compact( 'file' ) ),

-       );

-       wp_enqueue_script( 'wp-theme-plugin-editor' );

-       wp_add_inline_script( 'wp-theme-plugin-editor', sprintf( 'jQuery( function( $ ) { wp.themePluginEditor.init( $( "#template" ), %s ); } )', wp_json_encode( $settings ) ) );

-       wp_add_inline_script( 'wp-theme-plugin-editor', 'wp.themePluginEditor.themeOrPlugin = "theme";' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$settings = array(

+       'codeEditor' => wp_enqueue_code_editor( compact( 'file' ) ),

+);

+wp_enqueue_script( 'wp-theme-plugin-editor' );

+wp_add_inline_script( 'wp-theme-plugin-editor', sprintf( 'jQuery( function( $ ) { wp.themePluginEditor.init( $( "#template" ), %s ); } )', wp_json_encode( $settings ) ) );

+wp_add_inline_script( 'wp-theme-plugin-editor', 'wp.themePluginEditor.themeOrPlugin = "theme";' );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        require_once( ABSPATH . 'wp-admin/admin-header.php' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+require_once( ABSPATH . 'wp-admin/admin-header.php' );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        update_recently_edited( $file );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+update_recently_edited( $file );

</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 ( ! is_file( $file ) ) {

-               $error = true;

-       }

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( ! is_file( $file ) ) {

+       $error = true;

+}

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $content = '';

-       if ( ! empty( $posted_content ) ) {

-               $content = $posted_content;

-       } elseif ( ! $error && filesize( $file ) > 0 ) {

-               $f       = fopen( $file, 'r' );

-               $content = fread( $f, filesize( $file ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$content = '';

+if ( ! empty( $posted_content ) ) {

+       $content = $posted_content;

+} elseif ( ! $error && filesize( $file ) > 0 ) {

+       $f       = fopen( $file, 'r' );

+       $content = fread( $f, filesize( $file ) );

</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 ( '.php' == substr( $file, strrpos( $file, '.' ) ) ) {

-                       $functions = wp_doc_link_parse( $content );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '.php' == substr( $file, strrpos( $file, '.' ) ) ) {

+               $functions = wp_doc_link_parse( $content );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $docs_select  = '<select name="docs-list" id="docs-list">';

-                       $docs_select .= '<option value="">' . esc_attr__( 'Function Name&hellip;' ) . '</option>';

-                       foreach ( $functions as $function ) {

-                               $docs_select .= '<option value="' . esc_attr( urlencode( $function ) ) . '">' . htmlspecialchars( $function ) . '()</option>';

-                       }

-                       $docs_select .= '</select>';

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $docs_select  = '<select name="docs-list" id="docs-list">';

+               $docs_select .= '<option value="">' . esc_attr__( 'Function Name&hellip;' ) . '</option>';

+               foreach ( $functions as $function ) {

+                       $docs_select .= '<option value="' . esc_attr( urlencode( $function ) ) . '">' . htmlspecialchars( $function ) . '()</option>';

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-

-               $content = esc_textarea( $content );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $docs_select .= '</select>';

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $file_description = get_file_description( $relative_file );

-       $file_show        = array_search( $file, array_filter( $allowed_files ) );

-       $description      = esc_html( $file_description );

-       if ( $file_description != $file_show ) {

-               $description .= ' <span>(' . esc_html( $file_show ) . ')</span>';

-       }

-       ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $content = esc_textarea( $content );

+}

+

+$file_description = get_file_description( $relative_file );

+$file_show        = array_search( $file, array_filter( $allowed_files ) );

+$description      = esc_html( $file_description );

+if ( $file_description != $file_show ) {

+       $description .= ' <span>(' . esc_html( $file_show ) . ')</span>';

+}

+?>

</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="wrap">

</span><span class="cx" style="display: block; padding: 0 10px"> <h1><?php echo esc_html( $title ); ?></h1>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -195,6 +196,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                <pre><?php echo esc_html( $edit_error->get_error_message() ? $edit_error->get_error_message() : $edit_error->get_error_code() ); ?></pre>

</span><span class="cx" style="display: block; padding: 0 10px">        </div>

</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px"> <?php if ( preg_match( '/\.css$/', $file ) ) : ?>

</span><span class="cx" style="display: block; padding: 0 10px">        <div id="message" class="notice-info notice">

</span><span class="cx" style="display: block; padding: 0 10px">                <p><strong><?php _e( 'Did you know?' ); ?></strong></p>

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -213,11 +215,11 @@

</span><span class="cx" style="display: block; padding: 0 10px"> <div class="fileedit-sub">

</span><span class="cx" style="display: block; padding: 0 10px"> <div class="alignleft">

</span><span class="cx" style="display: block; padding: 0 10px"> <h2>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php

-echo $theme->display( 'Name' );

-if ( $description ) {

-       echo ': ' . $description;}

-?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php

+       echo $theme->display( 'Name' );

+       if ( $description ) {

+               echo ': ' . $description;}

+       ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> </h2>

</span><span class="cx" style="display: block; padding: 0 10px"> </div>

</span><span class="cx" style="display: block; padding: 0 10px"> <div class="alignright">

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -224,16 +226,16 @@

</span><span class="cx" style="display: block; padding: 0 10px">        <form action="theme-editor.php" method="get">

</span><span class="cx" style="display: block; padding: 0 10px">                <strong><label for="theme"><?php _e( 'Select theme to edit:' ); ?> </label></strong>

</span><span class="cx" style="display: block; padding: 0 10px">                <select name="theme" id="theme">

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php

-foreach ( wp_get_themes( array( 'errors' => null ) ) as $a_stylesheet => $a_theme ) {

-       if ( $a_theme->errors() && 'theme_no_stylesheet' == $a_theme->errors()->get_error_code() ) {

-               continue;

-       }

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <?php

+               foreach ( wp_get_themes( array( 'errors' => null ) ) as $a_stylesheet => $a_theme ) {

+                       if ( $a_theme->errors() && 'theme_no_stylesheet' == $a_theme->errors()->get_error_code() ) {

+                               continue;

+                       }

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $selected = $a_stylesheet == $stylesheet ? ' selected="selected"' : '';

-       echo "\n\t" . '<option value="' . esc_attr( $a_stylesheet ) . '"' . $selected . '>' . $a_theme->display( 'Name' ) . '</option>';

-}

-?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $selected = $a_stylesheet == $stylesheet ? ' selected="selected"' : '';

+                       echo "\n\t" . '<option value="' . esc_attr( $a_stylesheet ) . '"' . $selected . '>' . $a_theme->display( 'Name' ) . '</option>';

+               }

+               ?>

</ins><span class="cx" style="display: block; padding: 0 10px">                 </select>

</span><span class="cx" style="display: block; padding: 0 10px">                <?php submit_button( __( 'Select' ), '', 'Submit', false ); ?>

</span><span class="cx" style="display: block; padding: 0 10px">        </form>

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -240,11 +242,13 @@

</span><span class="cx" style="display: block; padding: 0 10px"> </div>

</span><span class="cx" style="display: block; padding: 0 10px"> <br class="clear" />

</span><span class="cx" style="display: block; padding: 0 10px"> </div>

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px"> <?php

</span><span class="cx" style="display: block; padding: 0 10px"> if ( $theme->errors() ) {

</span><span class="cx" style="display: block; padding: 0 10px">        echo '<div class="error"><p><strong>' . __( 'This theme is broken.' ) . '</strong> ' . $theme->errors()->get_error_message() . '</p></div>';

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> ?>

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px"> <div id="templateside">

</span><span class="cx" style="display: block; padding: 0 10px">        <h2 id="theme-files-label"><?php _e( 'Theme Files' ); ?></h2>

</span><span class="cx" style="display: block; padding: 0 10px">        <ul role="tree" aria-labelledby="theme-files-label">

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -285,49 +289,50 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        <input type="hidden" name="file" value="<?php echo esc_attr( $relative_file ); ?>" />

</span><span class="cx" style="display: block; padding: 0 10px">                        <input type="hidden" name="theme" value="<?php echo esc_attr( $theme->get_stylesheet() ); ?>" />

</span><span class="cx" style="display: block; padding: 0 10px">                </div>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        <?php if ( ! empty( $functions ) ) : ?>

-               <div id="documentation" class="hide-if-no-js">

-               <label for="docs-list"><?php _e( 'Documentation:' ); ?></label>

-               <?php echo $docs_select; ?>

-               <input disabled id="docs-lookup" type="button" class="button" value="<?php esc_attr_e( 'Look Up' ); ?>" onclick="if ( '' != jQuery('#docs-list').val() ) { window.open( 'https://api.wordpress.org/core/handbook/1.0/?function=' + escape( jQuery( '#docs-list' ).val() ) + '&amp;locale=<?php echo urlencode( get_user_locale() ); ?>&amp;version=<?php echo urlencode( get_bloginfo( 'version' ) ); ?>&amp;redirect=true'); }" />

-               </div>

-       <?php endif; ?>

</del><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        <div>

-               <div class="editor-notices">

-                       <?php if ( is_child_theme() && $theme->get_stylesheet() == get_template() ) : ?>

-                               <div class="notice notice-warning inline">

-                                       <p>

-                                               <?php

-                                               if ( is_writeable( $file ) ) {

-                                                       ?>

-                                               <strong><?php _e( 'Caution:' ); ?></strong><?php } ?>

-                                               <?php _e( 'This is a file in your current parent theme.' ); ?>

-                                       </p>

-                               </div>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <?php if ( ! empty( $functions ) ) : ?>

+                       <div id="documentation" class="hide-if-no-js">

+                               <label for="docs-list"><?php _e( 'Documentation:' ); ?></label>

+                               <?php echo $docs_select; ?>

+                               <input disabled id="docs-lookup" type="button" class="button" value="<?php esc_attr_e( 'Look Up' ); ?>" onclick="if ( '' != jQuery('#docs-list').val() ) { window.open( 'https://api.wordpress.org/core/handbook/1.0/?function=' + escape( jQuery( '#docs-list' ).val() ) + '&amp;locale=<?php echo urlencode( get_user_locale() ); ?>&amp;version=<?php echo urlencode( get_bloginfo( 'version' ) ); ?>&amp;redirect=true'); }" />

+                       </div>

+               <?php endif; ?>

+

+               <div>

+                       <div class="editor-notices">

+                               <?php if ( is_child_theme() && $theme->get_stylesheet() == get_template() ) : ?>

+                                       <div class="notice notice-warning inline">

+                                               <p>

+                                                       <?php if ( is_writeable( $file ) ) : ?>

+                                                               <strong><?php _e( 'Caution:' ); ?></strong>

+                                                       <?php endif; ?>

+                                                       <?php _e( 'This is a file in your current parent theme.' ); ?>

+                                               </p>

+                                       </div>

+                               <?php endif; ?>

+                       </div>

+                       <?php if ( is_writeable( $file ) ) : ?>

+                               <p class="submit">

+                                       <?php submit_button( __( 'Update File' ), 'primary', 'submit', false ); ?>

+                                       <span class="spinner"></span>

+                               </p>

+                       <?php else : ?>

+                               <p><em>

+                                       <?php

+                                       printf(

+                                               /* translators: %s: Documentation URL. */

+                                               __( 'You need to make this file writable before you can save your changes. See <a href="%s">Changing File Permissions</a> for more information.' ),

+                                               __( 'https://wordpress.org/support/article/changing-file-permissions/' )

+                                       );

+                                       ?>

+                               </em></p>

</ins><span class="cx" style="display: block; padding: 0 10px">                         <?php endif; ?>

</span><span class="cx" style="display: block; padding: 0 10px">                </div>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        <?php if ( is_writeable( $file ) ) : ?>

-               <p class="submit">

-                       <?php submit_button( __( 'Update File' ), 'primary', 'submit', false ); ?>

-                       <span class="spinner"></span>

-               </p>

-       <?php else : ?>

-               <p><em>

-                       <?php

-                       printf(

-                               /* translators: %s: Documentation URL. */

-                               __( 'You need to make this file writable before you can save your changes. See <a href="%s">Changing File Permissions</a> for more information.' ),

-                               __( 'https://wordpress.org/support/article/changing-file-permissions/' )

-                       );

-                       ?>

-               </em></p>

-       <?php endif; ?>

-       </div>

-       <?php wp_print_file_editor_templates(); ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

+               <?php wp_print_file_editor_templates(); ?>

</ins><span class="cx" style="display: block; padding: 0 10px">         </form>

</span><span class="cx" style="display: block; padding: 0 10px">        <?php

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-endif; // $error

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+endif; // End if $error.

</ins><span class="cx" style="display: block; padding: 0 10px"> ?>

</span><span class="cx" style="display: block; padding: 0 10px"> <br class="clear" />

</span><span class="cx" style="display: block; padding: 0 10px"> </div>

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -334,8 +339,9 @@

</span><span class="cx" style="display: block; padding: 0 10px"> <?php

</span><span class="cx" style="display: block; padding: 0 10px"> $dismissed_pointers = explode( ',', (string) get_user_meta( get_current_user_id(), 'dismissed_wp_pointers', true ) );

</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! in_array( 'theme_editor_notice', $dismissed_pointers, true ) ) :

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Get a back URL

-       $referer                    = wp_get_referer();

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Get a back URL.

+       $referer = wp_get_referer();

+

</ins><span class="cx" style="display: block; padding: 0 10px">         $excluded_referer_basenames = array( 'theme-editor.php', 'wp-login.php' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( $referer && ! in_array( basename( parse_url( $referer, PHP_URL_PATH ) ), $excluded_referer_basenames, true ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -344,38 +350,38 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $return_url = admin_url( '/' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px">        ?>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<div id="file-editor-warning" class="notification-dialog-wrap file-editor-warning hide-if-no-js hidden">

-       <div class="notification-dialog-background"></div>

-       <div class="notification-dialog">

-               <div class="file-editor-warning-content">

-                       <div class="file-editor-warning-message">

-                               <h1><?php _e( 'Heads up!' ); ?></h1>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div id="file-editor-warning" class="notification-dialog-wrap file-editor-warning hide-if-no-js hidden">

+               <div class="notification-dialog-background"></div>

+               <div class="notification-dialog">

+                       <div class="file-editor-warning-content">

+                               <div class="file-editor-warning-message">

+                                       <h1><?php _e( 'Heads up!' ); ?></h1>

+                                       <p>

+                                               <?php

+                                               _e( 'You appear to be making direct edits to your theme in the WordPress dashboard. We recommend that you don&#8217;t! Editing your theme directly could break your site and your changes may be lost in future updates.' );

+                                               ?>

+                                       </p>

+                                               <?php

+                                               if ( ! $theme->parent() ) {

+                                                       echo '<p>';

+                                                       echo sprintf(

+                                                               /* translators: %s: Link to documentation on child themes. */

+                                                               __( 'If you need to tweak more than your theme&#8217;s CSS, you might want to try <a href="%s">making a child theme</a>.' ),

+                                                               esc_url( __( 'https://developer.wordpress.org/themes/advanced-topics/child-themes/' ) )

+                                                       );

+                                                       echo '</p>';

+                                               }

+                                               ?>

+                                       <p><?php _e( 'If you decide to go ahead with direct edits anyway, use a file manager to create a copy with a new name and hang on to the original. That way, you can re-enable a functional version if something goes wrong.' ); ?></p>

+                               </div>

</ins><span class="cx" style="display: block; padding: 0 10px">                                 <p>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <?php

-                                       _e( 'You appear to be making direct edits to your theme in the WordPress dashboard. We recommend that you don&#8217;t! Editing your theme directly could break your site and your changes may be lost in future updates.' );

-                                       ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <a class="button file-editor-warning-go-back" href="<?php echo esc_url( $return_url ); ?>"><?php _e( 'Go back' ); ?></a>

+                                       <button type="button" class="file-editor-warning-dismiss button button-primary"><?php _e( 'I understand' ); ?></button>

</ins><span class="cx" style="display: block; padding: 0 10px">                                 </p>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <?php

-                                       if ( ! $theme->parent() ) {

-                                               echo '<p>';

-                                               echo sprintf(

-                                                       /* translators: %s: Link to documentation on child themes. */

-                                                       __( 'If you need to tweak more than your theme&#8217;s CSS, you might want to try <a href="%s">making a child theme</a>.' ),

-                                                       esc_url( __( 'https://developer.wordpress.org/themes/advanced-topics/child-themes/' ) )

-                                               );

-                                               echo '</p>';

-                                       }

-                                       ?>

-                               <p><?php _e( 'If you decide to go ahead with direct edits anyway, use a file manager to create a copy with a new name and hang on to the original. That way, you can re-enable a functional version if something goes wrong.' ); ?></p>

</del><span class="cx" style="display: block; padding: 0 10px">                         </div>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <p>

-                               <a class="button file-editor-warning-go-back" href="<?php echo esc_url( $return_url ); ?>"><?php _e( 'Go back' ); ?></a>

-                               <button type="button" class="file-editor-warning-dismiss button button-primary"><?php _e( 'I understand' ); ?></button>

-                       </p>

</del><span class="cx" style="display: block; padding: 0 10px">                 </div>

</span><span class="cx" style="display: block; padding: 0 10px">        </div>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-</div>

</del><span class="cx" style="display: block; padding: 0 10px">         <?php

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-endif; // editor warning notice

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+endif; // Editor warning notice.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> include( ABSPATH . 'wp-admin/admin-footer.php' );

</span></span></pre></div>

<a id="trunksrcwpadminthemeinstallphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/theme-install.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/theme-install.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/theme-install.php        2020-01-29 00:43:23 UTC (rev 47122)

</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">                'l10n'            => array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'addNew'              => __( 'Add New Theme' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        'search'              => __( 'Search Themes' ),

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'searchPlaceholder'   => __( 'Search themes...' ), // placeholder (no ellipsis)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'searchPlaceholder'   => __( 'Search themes...' ), // Placeholder (no ellipsis).

</ins><span class="cx" style="display: block; padding: 0 10px">                         'upload'              => __( 'Upload Theme' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        'back'                => __( 'Back' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        'error'               => sprintf(

</span></span></pre></div>

<a id="trunksrcwpadminthemesphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/themes.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/themes.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/themes.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -87,7 +87,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> $title       = __( 'Manage Themes' );

</span><span class="cx" style="display: block; padding: 0 10px"> $parent_file = 'themes.php';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Help tab: Overview

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Help tab: Overview.

</ins><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( 'switch_themes' ) ) {

<span class="cx" style="display: block; padding: 0 10px">        $help_overview = '' . __( 'This screen is used for managing your installed themes. Aside from the default theme(s) included with your WordPress installation, themes are designed and developed by third parties.' ) . '' .

</span><span class="cx" style="display: block; padding: 0 10px">                '<p>' . __( 'From this screen you can:' ) . '</p>' .

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -104,9 +104,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'content' => $help_overview,

</span><span class="cx" style="display: block; padding: 0 10px">                )

</span><span class="cx" style="display: block; padding: 0 10px">        );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-} // switch_themes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+} // End if 'switch_themes'.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Help tab: Adding Themes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Help tab: Adding Themes.

</ins><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( 'install_themes' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">        if ( is_multisite() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $help_install = '<p>' . __( 'Installing themes on Multisite can only be done from the Network Admin section.' ) . '</p>';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -125,9 +125,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'content' => $help_install,

</span><span class="cx" style="display: block; padding: 0 10px">                )

</span><span class="cx" style="display: block; padding: 0 10px">        );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-} // install_themes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+} // End if 'install_themes'.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Help tab: Previewing and Customizing

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Help tab: Previewing and Customizing.

</ins><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">        $help_customize =

<span class="cx" style="display: block; padding: 0 10px">                '' . __( 'Tap or hover on any theme then click the Live Preview button to see a live preview of that theme and change theme options in a separate, full-screen view. You can also find a Live Preview button at the bottom of the theme details screen. Any installed theme can be previewed and customized in this way.' ) . '' .

</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">                        'content' => $help_customize,

</span><span class="cx" style="display: block; padding: 0 10px">                )

</span><span class="cx" style="display: block; padding: 0 10px">        );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-} // edit_theme_options && customize

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+} // End if 'edit_theme_options' && 'customize'.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> get_current_screen()->set_help_sidebar(

</span><span class="cx" style="display: block; padding: 0 10px">        '<p><strong>' . __( 'For more information:' ) . '</strong></p>' .

</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">                'l10n'     => array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'addNew'            => __( 'Add New Theme' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        'search'            => __( 'Search Installed Themes' ),

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'searchPlaceholder' => __( 'Search installed themes...' ), // placeholder (no ellipsis)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'searchPlaceholder' => __( 'Search installed themes...' ), // Placeholder (no ellipsis).

</ins><span class="cx" style="display: block; padding: 0 10px">                         /* translators: %d: Number of themes. */

</span><span class="cx" style="display: block; padding: 0 10px">                        'themesFound'       => __( 'Number of Themes found: %d' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        'noThemesFound'     => __( 'No themes found. Try a different search.' ),

</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">                if ( 'themes.php' == $item[2] || 'theme-editor.php' == $item[2] || 0 === strpos( $item[2], 'customize.php' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        continue;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // 0 = name, 1 = capability, 2 = file

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // 0 = name, 1 = capability, 2 = file.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ( strcmp( $self, $item[2] ) == 0 && empty( $parent_file ) ) || ( $parent_file && ( $item[2] == $parent_file ) ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $class = ' current';

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span></span></pre></div>

<a id="trunksrcwpadminupdatecorephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/update-core.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/update-core.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/update-core.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -591,7 +591,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! WP_Filesystem( $credentials, ABSPATH, $allow_relaxed_file_ownership ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Failed to connect, Error and request again

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Failed to connect. Error and request again.

</ins><span class="cx" style="display: block; padding: 0 10px">                 request_filesystem_credentials( $url, '', true, ABSPATH, array( 'version', 'locale' ), $allow_relaxed_file_ownership );

</span><span class="cx" style="display: block; padding: 0 10px">                echo '</div>';

</span><span class="cx" style="display: block; padding: 0 10px">                return;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -732,7 +732,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 ( 'upgrade-core' == $action ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Force a update check when requested

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Force a update check when requested.

</ins><span class="cx" style="display: block; padding: 0 10px">         $force_check = ! empty( $_GET['force-check'] );

</span><span class="cx" style="display: block; padding: 0 10px">        wp_version_check( array(), $force_check );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunksrcwpadminupdatephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/update.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/update.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/update.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,7 +91,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        echo '<p>' . __( 'Plugin failed to reactivate due to a fatal error.' ) . '</p>';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        error_reporting( E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR );

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        ini_set( 'display_errors', true ); //Ensure that Fatal errors are displayed.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 ini_set( 'display_errors', true ); // Ensure that fatal errors are displayed.

</ins><span class="cx" style="display: block; padding: 0 10px">                         wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $plugin );

</span><span class="cx" style="display: block; padding: 0 10px">                        include( WP_PLUGIN_DIR . '/' . $plugin );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -102,7 +102,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        wp_die( __( 'Sorry, you are not allowed to install plugins on this site.' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                include_once( ABSPATH . 'wp-admin/includes/plugin-install.php' ); //for plugins_api..

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         include_once( ABSPATH . 'wp-admin/includes/plugin-install.php' ); // For plugins_api().

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                check_admin_referer( 'install-plugin_' . $plugin );

</span><span class="cx" style="display: block; padding: 0 10px">                $api = plugins_api(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -132,7 +132,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $url .= '&from=' . urlencode( stripslashes( $_GET['from'] ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $type = 'web'; //Install plugin type, From Web or an Upload.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $type = 'web'; // Install plugin type, From Web or an Upload.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $upgrader = new Plugin_Upgrader( new Plugin_Installer_Skin( compact( 'title', 'url', 'nonce', 'plugin', 'api' ) ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $upgrader->install( $api->download_link );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -158,7 +158,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $title = sprintf( __( 'Installing Plugin from uploaded file: %s' ), esc_html( basename( $file_upload->filename ) ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $nonce = 'plugin-upload';

</span><span class="cx" style="display: block; padding: 0 10px">                $url   = add_query_arg( array( 'package' => $file_upload->id ), 'update.php?action=upload-plugin' );

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $type  = 'upload'; //Install plugin type, From Web or an Upload.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $type  = 'upload'; // Install plugin type, From Web or an Upload.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $upgrader = new Plugin_Upgrader( new Plugin_Installer_Skin( compact( 'type', 'title', 'nonce', 'url' ) ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $result   = $upgrader->install( $file_upload->package );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -224,7 +224,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        wp_die( __( 'Sorry, you are not allowed to install themes on this site.' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' ); //for themes_api..

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' ); // For themes_api().

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                check_admin_referer( 'install-theme_' . $theme );

</span><span class="cx" style="display: block; padding: 0 10px">                $api = themes_api(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -236,7 +236,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        'tags'     => false,

</span><span class="cx" style="display: block; padding: 0 10px">                                ),

</span><span class="cx" style="display: block; padding: 0 10px">                        )

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                ); //Save on a bit of bandwidth.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         ); // Save on a bit of bandwidth.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( is_wp_error( $api ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        wp_die( $api );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -251,7 +251,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $title = sprintf( __( 'Installing Theme: %s' ), $api->name . ' ' . $api->version );

</span><span class="cx" style="display: block; padding: 0 10px">                $nonce = 'install-theme_' . $theme;

</span><span class="cx" style="display: block; padding: 0 10px">                $url   = 'update.php?action=install-theme&theme=' . urlencode( $theme );

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $type  = 'web'; //Install theme type, From Web or an Upload.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $type  = 'web'; // Install theme type, From Web or an Upload.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $upgrader = new Theme_Upgrader( new Theme_Installer_Skin( compact( 'title', 'url', 'nonce', 'plugin', 'api' ) ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $upgrader->install( $api->download_link );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -278,7 +278,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $title = sprintf( __( 'Installing Theme from uploaded file: %s' ), esc_html( basename( $file_upload->filename ) ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $nonce = 'theme-upload';

</span><span class="cx" style="display: block; padding: 0 10px">                $url   = add_query_arg( array( 'package' => $file_upload->id ), 'update.php?action=upload-theme' );

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $type  = 'upload'; //Install plugin type, From Web or an Upload.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $type  = 'upload'; // Install theme type, From Web or an Upload.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $upgrader = new Theme_Upgrader( new Theme_Installer_Skin( compact( 'type', 'title', 'nonce', 'url' ) ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $result   = $upgrader->install( $file_upload->package );

</span></span></pre></div>

<a id="trunksrcwpadminuploadphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/upload.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/upload.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/upload.php       2020-01-29 00:43:23 UTC (rev 47122)

</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">        remove_action( 'admin_head', 'wp_admin_canonical_url' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $q = $_GET;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // let JS handle this

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Let JS handle this.

</ins><span class="cx" style="display: block; padding: 0 10px">         unset( $q['s'] );

</span><span class="cx" style="display: block; padding: 0 10px">        $vars   = wp_edit_attachments_query_vars( $q );

</span><span class="cx" style="display: block; padding: 0 10px">        $ignore = array( 'mode', 'post_type', 'post_status', 'posts_per_page' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -114,7 +114,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> $wp_list_table = _get_list_table( 'WP_Media_List_Table' );

</span><span class="cx" style="display: block; padding: 0 10px"> $pagenum       = $wp_list_table->get_pagenum();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Handle bulk actions

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Handle bulk actions.

</ins><span class="cx" style="display: block; padding: 0 10px"> $doaction = $wp_list_table->current_action();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> if ( $doaction ) {

</span></span></pre></div>

<a id="trunksrcwpadminusereditphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/user-edit.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/user-edit.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/user-edit.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -235,14 +235,14 @@

</span><span class="cx" style="display: block; padding: 0 10px"> <hr class="wp-header-end">

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> <form id="your-profile" action="<?php echo esc_url( self_admin_url( IS_PROFILE_PAGE ? 'profile.php' : 'user-edit.php' ) ); ?>" method="post" novalidate="novalidate"

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                                                        <?php

-                                                                                       /**

-                                                                                        * Fires inside the your-profile form tag on the user editing screen.

-                                                                                        *

-                                                                                        * @since 3.0.0

-                                                                                        */

-                                                                                       do_action( 'user_edit_form_tag' );

-                                                                                       ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <?php

+               /**

+                * Fires inside the your-profile form tag on the user editing screen.

+                *

+                * @since 3.0.0

+                */

+               do_action( 'user_edit_form_tag' );

+               ?>

</ins><span class="cx" style="display: block; padding: 0 10px">         >

</span><span class="cx" style="display: block; padding: 0 10px">                <?php wp_nonce_field( 'update-user_' . $user_id ); ?>

</span><span class="cx" style="display: block; padding: 0 10px">                <?php if ( $wp_http_referer ) : ?>

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -310,10 +310,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        ?>

</span><span class="cx" style="display: block; padding: 0 10px">                </td>

</span><span class="cx" style="display: block; padding: 0 10px">        </tr>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <?php

-endif; // $_wp_admin_css_colors

-               if ( ! ( IS_PROFILE_PAGE && ! $user_can_edit ) ) :

-                       ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <?php endif; // End if count ( $_wp_admin_css_colors ) > 1 ?>

+

+               <?php if ( ! ( IS_PROFILE_PAGE && ! $user_can_edit ) ) : ?>

</ins><span class="cx" style="display: block; padding: 0 10px">         <tr class="user-comment-shortcuts-wrap">

</span><span class="cx" style="display: block; padding: 0 10px">                <th scope="row"><?php _e( 'Keyboard Shortcuts' ); ?></th>

</span><span class="cx" style="display: block; padding: 0 10px">                <td>

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -411,14 +410,14 @@

</span><span class="cx" style="display: block; padding: 0 10px"> <tr class="user-role-wrap"><th><label for="role"><?php _e( 'Role' ); ?></label></th>

</span><span class="cx" style="display: block; padding: 0 10px"> <td><select name="role" id="role">

</span><span class="cx" style="display: block; padding: 0 10px">                        <?php

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Compare user role against currently editable roles

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Compare user role against currently editable roles.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $user_roles = array_intersect( array_values( $profileuser->roles ), array_keys( get_editable_roles() ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $user_role  = reset( $user_roles );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // print the full list of roles with the primary one selected.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Print the full list of roles with the primary one selected.

</ins><span class="cx" style="display: block; padding: 0 10px">                         wp_dropdown_roles( $user_role );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // print the 'no role' option. Make it selected if the user has no role yet.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Print the 'no role' option. Make it selected if the user has no role yet.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( $user_role ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                echo '<option value="">' . __( '&mdash; No role for this site &mdash;' ) . '</option>';

</span><span class="cx" style="display: block; padding: 0 10px">                        } else {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -427,7 +426,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        ?>

</span><span class="cx" style="display: block; padding: 0 10px"> </select></td></tr>

</span><span class="cx" style="display: block; padding: 0 10px">                        <?php

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-endif; //!IS_PROFILE_PAGE

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         endif; // End if ! IS_PROFILE_PAGE.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( is_multisite() && is_network_admin() && ! IS_PROFILE_PAGE && current_user_can( 'manage_network_options' ) && ! isset( $super_admins ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        ?>

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -478,7 +477,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $public_display['display_lastfirst'] = $profileuser->last_name . ' ' . $profileuser->first_name;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( ! in_array( $profileuser->display_name, $public_display ) ) { // Only add this if it isn't duplicated elsewhere

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( ! in_array( $profileuser->display_name, $public_display ) ) { // Only add this if it isn't duplicated elsewhere.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $public_display = array( 'display_displayname' => $profileuser->display_name ) + $public_display;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunksrcwpadminusernewphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/user-new.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/user-new.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/user-new.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -58,7 +58,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">-        // Adding an existing user to this blog

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Adding an existing user to this blog.

</ins><span class="cx" style="display: block; padding: 0 10px">         $new_user_email = $user_details->user_email;

</span><span class="cx" style="display: block; padding: 0 10px">        $redirect       = 'user-new.php';

</span><span class="cx" style="display: block; padding: 0 10px">        $username       = $user_details->user_login;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -174,7 +174,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        die();

</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">-                // Adding a new user to this site

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Adding a new user to this site.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $new_user_email = wp_unslash( $_REQUEST['email'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $user_details   = wpmu_validate_user_signup( $_REQUEST['user_login'], $new_user_email );

</span><span class="cx" style="display: block; padding: 0 10px">                if ( is_wp_error( $user_details['errors'] ) && $user_details['errors']->has_errors() ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -183,8 +183,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        /** This filter is documented in wp-includes/user.php */

</span><span class="cx" style="display: block; padding: 0 10px">                        $new_user_login = apply_filters( 'pre_user_login', sanitize_user( wp_unslash( $_REQUEST['user_login'] ), true ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( isset( $_POST['noconfirmation'] ) && current_user_can( 'manage_network_users' ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                add_filter( 'wpmu_signup_user_notification', '__return_false' ); // Disable confirmation email

-                               add_filter( 'wpmu_welcome_user_notification', '__return_false' ); // Disable welcome email

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         add_filter( 'wpmu_signup_user_notification', '__return_false' );  // Disable confirmation email.

+                               add_filter( 'wpmu_welcome_user_notification', '__return_false' ); // Disable welcome email.

</ins><span class="cx" style="display: block; padding: 0 10px">                         }

</span><span class="cx" style="display: block; padding: 0 10px">                        wpmu_signup_user(

</span><span class="cx" style="display: block; padding: 0 10px">                                $new_user_login,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -446,7 +446,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        <?php submit_button( __( 'Add Existing User' ), 'primary', 'adduser', true, array( 'id' => 'addusersub' ) ); ?>

</span><span class="cx" style="display: block; padding: 0 10px"> </form>

</span><span class="cx" style="display: block; padding: 0 10px">        <?php

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-} // is_multisite()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+} // End if is_multisite().

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( 'create_users' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">        if ( $do_both ) {

</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">                        <label for="send_user_notification"><?php _e( 'Send the new user an email about their account.' ); ?></label>

</span><span class="cx" style="display: block; padding: 0 10px">                </td>

</span><span class="cx" style="display: block; padding: 0 10px">        </tr>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php } // !is_multisite ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php } // End if ! is_multisite(). ?>

</ins><span class="cx" style="display: block; padding: 0 10px">         <tr class="form-field">

</span><span class="cx" style="display: block; padding: 0 10px">                <th scope="row"><label for="role"><?php _e( 'Role' ); ?></label></th>

</span><span class="cx" style="display: block; padding: 0 10px">                <td><select name="role" id="role">

</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">        <?php submit_button( __( 'Add New User' ), 'primary', 'createuser', true, array( 'id' => 'createusersub' ) ); ?>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> </form>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php } // current_user_can('create_users') ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php } // End if current_user_can( 'create_users' ). ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> </div>

</span><span class="cx" style="display: block; padding: 0 10px"> <?php

</span><span class="cx" style="display: block; padding: 0 10px"> include( ABSPATH . 'wp-admin/admin-footer.php' );

</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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/users.php        2020-01-29 00:43:23 UTC (rev 47122)

</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"> add_screen_option( 'per_page' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// contextual help - choose Help on the top right of admin panel to preview this.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Contextual help - choose Help on the top right of admin panel to preview this.

</ins><span class="cx" style="display: block; padding: 0 10px"> get_current_screen()->add_help_tab(

</span><span class="cx" style="display: block; padding: 0 10px">        array(

</span><span class="cx" style="display: block; padding: 0 10px">                'id'      => 'overview',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -131,7 +131,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! current_user_can( 'promote_user', $id ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                wp_die( __( 'Sorry, you are not allowed to edit this user.' ), 403 );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // The new role of the current user must also have the promote_users cap or be a multisite super admin

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

+                       // The new role of the current user must also have the promote_users cap or be a multisite super admin.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( $id == $current_user->ID && ! $wp_roles->role_objects[ $role ]->has_cap( 'promote_users' )

</span><span class="cx" style="display: block; padding: 0 10px">                        && ! ( is_multisite() && current_user_can( 'manage_network_users' ) ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        $update = 'err_admin_role';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -594,6 +595,6 @@

</span><span class="cx" style="display: block; padding: 0 10px">                <?php

</span><span class="cx" style="display: block; padding: 0 10px">                break;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-} // end of the $doaction switch

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+} // End of the $doaction switch.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> include( ABSPATH . 'wp-admin/admin-footer.php' );

</span></span></pre></div>

<a id="trunksrcwpadminwidgetsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/widgets.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/widgets.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-admin/widgets.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -88,7 +88,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        wp_die( __( 'The theme you are currently using isn&#8217;t widget-aware, meaning that it has no sidebars that you are able to change. For information on making your theme widget-aware, please <a href="https://developer.wordpress.org/themes/functionality/widgets/">follow these instructions</a>.' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// These are the widgets grouped by sidebar

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// These are the widgets grouped by sidebar.

</ins><span class="cx" style="display: block; padding: 0 10px"> $sidebars_widgets = wp_get_sidebars_widgets();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $sidebars_widgets ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -101,7 +101,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! is_registered_sidebar( $sidebar_id ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( ! empty( $widgets ) ) { // register the inactive_widgets area as sidebar

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( ! empty( $widgets ) ) { // Register the inactive_widgets area as sidebar.

</ins><span class="cx" style="display: block; padding: 0 10px">                         register_sidebar(

</span><span class="cx" style="display: block; padding: 0 10px">                                array(

</span><span class="cx" style="display: block; padding: 0 10px">                                        'name'          => __( 'Inactive Sidebar (not used)' ),

</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">        }

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// register the inactive_widgets area as sidebar

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Register the inactive_widgets area as sidebar.

</ins><span class="cx" style="display: block; padding: 0 10px"> register_sidebar(

</span><span class="cx" style="display: block; padding: 0 10px">        array(

</span><span class="cx" style="display: block; padding: 0 10px">                'name'          => __( 'Inactive Widgets' ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -136,7 +136,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> retrieve_widgets();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// We're saving a widget without js

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// We're saving a widget without JS.

</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_POST['savewidget'] ) || isset( $_POST['removewidget'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">        $widget_id = $_POST['widget-id'];

</span><span class="cx" style="display: block; padding: 0 10px">        check_admin_referer( "save-delete-widget-$widget_id" );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -216,7 +216,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        exit;

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Remove inactive widgets without js

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Remove inactive widgets without JS.

</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_POST['removeinactivewidgets'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">        check_admin_referer( 'remove-inactive-widgets', '_wpnonce_remove_inactive_widgets' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -238,17 +238,17 @@

</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Output the widget form without js

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Output the widget form without JS.

</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_GET['editwidget'] ) && $_GET['editwidget'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">        $widget_id = $_GET['editwidget'];

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( isset( $_GET['addnew'] ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Default to the first sidebar

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Default to the first sidebar.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $keys    = array_keys( $wp_registered_sidebars );

</span><span class="cx" style="display: block; padding: 0 10px">                $sidebar = reset( $keys );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( isset( $_GET['base'] ) && isset( $_GET['num'] ) ) { // multi-widget

-                       // Copy minimal info from an existing instance of this widget to a new instance

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( isset( $_GET['base'] ) && isset( $_GET['num'] ) ) { // Multi-widget.

+                       // Copy minimal info from an existing instance of this widget to a new instance.

</ins><span class="cx" style="display: block; padding: 0 10px">                         foreach ( $wp_registered_widget_controls as $control ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( $_GET['base'] === $control['id_base'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        $control_callback                                = $control['callback'];

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -539,7 +539,10 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        ?>

</span><span class="cx" style="display: block; padding: 0 10px">        <div class="<?php echo esc_attr( $wrap_class ); ?>">

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <?php wp_list_widget_controls( $sidebar, $registered_sidebar['name'] ); // Show the control forms for each of the widgets in this sidebar ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <?php

+               // Show the control forms for each of the widgets in this sidebar.

+               wp_list_widget_controls( $sidebar, $registered_sidebar['name'] );

+               ?>

</ins><span class="cx" style="display: block; padding: 0 10px">         </div>

</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="trunksrcwpcontentthemestwentyelevenarchivephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyeleven/archive.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyeleven/archive.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyeleven/archive.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,16 +40,18 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                <?php twentyeleven_content_nav( 'nav-above' ); ?>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <?php /* Start the Loop */ ?>

</del><span class="cx" style="display: block; padding: 0 10px">                                 <?php

<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                // Start the Loop.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 while ( have_posts() ) :

</span><span class="cx" style="display: block; padding: 0 10px">                                        the_post();

</span><span class="cx" style="display: block; padding: 0 10px">                                        ?>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                        <?php

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                /* Include the Post-Format-specific template for the content.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         /*

+                                                * Include the Post-Format-specific template for the content.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                  * If you want to overload this in a child theme then include a file

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                 * called content-___.php (where ___ is the Post Format name) and that will be used instead.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                          * called content-___.php (where ___ is the Post Format name) and that

+                                                * will be used instead.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                  */

</span><span class="cx" style="display: block; padding: 0 10px">                                                get_template_part( 'content', get_post_format() );

</span><span class="cx" style="display: block; padding: 0 10px">                                        ?>

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyelevenauthorphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyeleven/author.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyeleven/author.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyeleven/author.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,9 +36,9 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                <?php

</span><span class="cx" style="display: block; padding: 0 10px">                                        /*

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                         * Since we called the_post() above, we need to

-                                        * rewind the loop back to the beginning that way

-                                        * we can run the loop properly, in full.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                  * Since we called the_post() above, we need

+                                        * to rewind the loop back to the beginning.

+                                        * That way we can run the loop properly, in full.

</ins><span class="cx" style="display: block; padding: 0 10px">                                          */

</span><span class="cx" style="display: block; padding: 0 10px">                                        rewind_posts();

</span><span class="cx" style="display: block; padding: 0 10px">                                ?>

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,8 +75,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                </div><!-- #author-info -->

</span><span class="cx" style="display: block; padding: 0 10px">                                <?php endif; ?>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <?php /* Start the Loop */ ?>

</del><span class="cx" style="display: block; padding: 0 10px">                                 <?php

<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                // Start the Loop.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 while ( have_posts() ) :

</span><span class="cx" style="display: block; padding: 0 10px">                                        the_post();

</span><span class="cx" style="display: block; padding: 0 10px">                                        ?>

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -85,7 +85,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                                /*

<span class="cx" style="display: block; padding: 0 10px">                                                 * Include the Post-Format-specific template for the content.

</span><span class="cx" style="display: block; padding: 0 10px">                                                 * If you want to overload this in a child theme then include a file

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                 * called content-___.php (where ___ is the Post Format name) and that will be used instead.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                          * called content-___.php (where ___ is the Post Format name) and that

+                                                * will be used instead.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                  */

</span><span class="cx" style="display: block; padding: 0 10px">                                                get_template_part( 'content', get_post_format() );

</span><span class="cx" style="display: block; padding: 0 10px">                                        ?>

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyelevencategoryphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyeleven/category.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyeleven/category.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyeleven/category.php       2020-01-29 00:43:23 UTC (rev 47122)

</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">                                <?php twentyeleven_content_nav( 'nav-above' ); ?>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <?php /* Start the Loop */ ?>

</del><span class="cx" style="display: block; padding: 0 10px">                                 <?php

<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                // Start the Loop.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 while ( have_posts() ) :

</span><span class="cx" style="display: block; padding: 0 10px">                                        the_post();

</span><span class="cx" style="display: block; padding: 0 10px">                                        ?>

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,7 +49,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                                /*

<span class="cx" style="display: block; padding: 0 10px">                                                 * Include the Post-Format-specific template for the content.

</span><span class="cx" style="display: block; padding: 0 10px">                                                 * If you want to overload this in a child theme then include a file

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                 * called content-___.php (where ___ is the Post Format name) and that will be used instead.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                          * called content-___.php (where ___ is the Post Format name) and that

+                                                * will be used instead.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                  */

</span><span class="cx" style="display: block; padding: 0 10px">                                                get_template_part( 'content', get_post_format() );

</span><span class="cx" style="display: block; padding: 0 10px">                                        ?>

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyelevencommentsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyeleven/comments.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyeleven/comments.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyeleven/comments.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,13 +48,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        ?>

</span><span class="cx" style="display: block; padding: 0 10px">                </h2>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // Are there comments to navigate through? ?>

</ins><span class="cx" style="display: block; padding: 0 10px">                 <nav id="comment-nav-above">

</span><span class="cx" style="display: block; padding: 0 10px">                        <h1 class="assistive-text"><?php _e( 'Comment navigation', 'twentyeleven' ); ?></h1>

</span><span class="cx" style="display: block; padding: 0 10px">                        <div class="nav-previous"><?php previous_comments_link( __( '&larr; Older Comments', 'twentyeleven' ) ); ?></div>

</span><span class="cx" style="display: block; padding: 0 10px">                        <div class="nav-next"><?php next_comments_link( __( 'Newer Comments &rarr;', 'twentyeleven' ) ); ?></div>

</span><span class="cx" style="display: block; padding: 0 10px">                </nav>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <?php endif; // check for comment navigation ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <?php endif; // Check for comment navigation. ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                <ol class="commentlist">

</span><span class="cx" style="display: block; padding: 0 10px">                        <?php

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -69,13 +69,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        ?>

</span><span class="cx" style="display: block; padding: 0 10px">                </ol>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // Are there comments to navigate through? ?>

</ins><span class="cx" style="display: block; padding: 0 10px">                 <nav id="comment-nav-below">

</span><span class="cx" style="display: block; padding: 0 10px">                        <h1 class="assistive-text"><?php _e( 'Comment navigation', 'twentyeleven' ); ?></h1>

</span><span class="cx" style="display: block; padding: 0 10px">                        <div class="nav-previous"><?php previous_comments_link( __( '&larr; Older Comments', 'twentyeleven' ) ); ?></div>

</span><span class="cx" style="display: block; padding: 0 10px">                        <div class="nav-next"><?php next_comments_link( __( 'Newer Comments &rarr;', 'twentyeleven' ) ); ?></div>

</span><span class="cx" style="display: block; padding: 0 10px">                </nav>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <?php endif; // check for comment navigation ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <?php endif; // Check for comment navigation. ?>

</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">                /*

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyelevencontentasidephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyeleven/content-aside.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyeleven/content-aside.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyeleven/content-aside.php  2020-01-29 00:43:23 UTC (rev 47122)

</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">                        <?php endif; ?>

</span><span class="cx" style="display: block; padding: 0 10px">                </header><!-- .entry-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">-                <?php if ( is_search() ) : // Only display Excerpts for Search ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <?php if ( is_search() ) : // Only display excerpts for search. ?>

</ins><span class="cx" style="display: block; padding: 0 10px">                 <div class="entry-summary">

</span><span class="cx" style="display: block; padding: 0 10px">                        <?php the_excerpt(); ?>

</span><span class="cx" style="display: block; padding: 0 10px">                </div><!-- .entry-summary -->

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyelevencontentgalleryphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyeleven/content-gallery.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyeleven/content-gallery.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyeleven/content-gallery.php        2020-01-29 00:43:23 UTC (rev 47122)

</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">                </div><!-- .entry-meta -->

</span><span class="cx" style="display: block; padding: 0 10px">        </header><!-- .entry-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">-        <?php if ( is_search() ) : // Only display Excerpts for search pages ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( is_search() ) : // Only display excerpts for search. ?>

</ins><span class="cx" style="display: block; padding: 0 10px">                 <div class="entry-summary">

</span><span class="cx" style="display: block; padding: 0 10px">                        <?php the_excerpt(); ?>

</span><span class="cx" style="display: block; padding: 0 10px">                </div><!-- .entry-summary -->

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,7 +54,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">                                        </em></p>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                <?php endif; // end twentyeleven_get_gallery_images() check ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <?php endif; // End twentyeleven_get_gallery_images() check. ?>

</ins><span class="cx" style="display: block; padding: 0 10px">                                 <?php the_excerpt(); ?>

</span><span class="cx" style="display: block; padding: 0 10px">                <?php endif; ?>

</span><span class="cx" style="display: block; padding: 0 10px">                        <?php

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,7 +82,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $show_sep = true;

</span><span class="cx" style="display: block; padding: 0 10px">                        ?>

</span><span class="cx" style="display: block; padding: 0 10px">                </span>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <?php endif; // End if categories ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <?php endif; // End if categories. ?>

</ins><span class="cx" style="display: block; padding: 0 10px">                 <?php

</span><span class="cx" style="display: block; padding: 0 10px">                        /* translators: Used between list items, there is a space after the comma. */

</span><span class="cx" style="display: block; padding: 0 10px">                        $tags_list = get_the_tag_list( '', __( ', ', 'twentyeleven' ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -90,7 +90,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( $show_sep ) :

</span><span class="cx" style="display: block; padding: 0 10px">                                ?>

</span><span class="cx" style="display: block; padding: 0 10px">                <span class="sep"> | </span>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <?php endif; // End if $show_sep ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <?php endif; // End if $show_sep. ?>

</ins><span class="cx" style="display: block; padding: 0 10px">                 <span class="tag-links">

</span><span class="cx" style="display: block; padding: 0 10px">                        <?php

</span><span class="cx" style="display: block; padding: 0 10px">                        /* translators: 1: CSS classes, 2: List of tags. */

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -98,14 +98,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $show_sep = true;

</span><span class="cx" style="display: block; padding: 0 10px">                        ?>

</span><span class="cx" style="display: block; padding: 0 10px">                </span>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <?php endif; // End if $tags_list ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <?php endif; // End if $tags_list. ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                <?php if ( comments_open() ) : ?>

</span><span class="cx" style="display: block; padding: 0 10px">                        <?php if ( $show_sep ) : ?>

</span><span class="cx" style="display: block; padding: 0 10px">                <span class="sep"> | </span>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <?php endif; // End if $show_sep ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <?php endif; // End if $show_sep. ?>

</ins><span class="cx" style="display: block; padding: 0 10px">                 <span class="comments-link"><?php comments_popup_link( '<span class="leave-reply">' . __( 'Leave a reply', 'twentyeleven' ) . '</span>', __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?></span>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <?php endif; // End if comments_open() ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <?php endif; // End if comments_open(). ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                <?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>

</span><span class="cx" style="display: block; padding: 0 10px">        </footer><!-- .entry-meta -->

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyelevencontentimagephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyeleven/content-image.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyeleven/content-image.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyeleven/content-image.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,7 +65,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        printf( __( '<span class="%1$s">Posted in</span> %2$s', 'twentyeleven' ), 'entry-utility-prep entry-utility-prep-cat-links', $categories_list );

</span><span class="cx" style="display: block; padding: 0 10px">                                        ?>

</span><span class="cx" style="display: block; padding: 0 10px">                                </span>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <?php endif; // End if categories ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <?php endif; // End if categories. ?>

</ins><span class="cx" style="display: block; padding: 0 10px">                                 <?php

</span><span class="cx" style="display: block; padding: 0 10px">                                        /* translators: Used between list items, there is a space after the comma. */

</span><span class="cx" style="display: block; padding: 0 10px">                                        $tags_list = get_the_tag_list( '', __( ', ', 'twentyeleven' ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,11 +77,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        printf( __( '<span class="%1$s">Tagged</span> %2$s', 'twentyeleven' ), 'entry-utility-prep entry-utility-prep-tag-links', $tags_list );

</span><span class="cx" style="display: block; padding: 0 10px">                                        ?>

</span><span class="cx" style="display: block; padding: 0 10px">                                </span>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <?php endif; // End if $tags_list ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <?php endif; // End if $tags_list. ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                <?php if ( comments_open() ) : ?>

</span><span class="cx" style="display: block; padding: 0 10px">                                <span class="comments-link"><?php comments_popup_link( '<span class="leave-reply">' . __( 'Leave a reply', 'twentyeleven' ) . '</span>', __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?></span>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <?php endif; // End if comments_open() ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <?php endif; // End if comments_open(). ?>

</ins><span class="cx" style="display: block; padding: 0 10px">                         </div><!-- .entry-meta -->

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        <?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyelevencontentlinkphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyeleven/content-link.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyeleven/content-link.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyeleven/content-link.php   2020-01-29 00:43:23 UTC (rev 47122)

</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">                        <?php endif; ?>

</span><span class="cx" style="display: block; padding: 0 10px">                </header><!-- .entry-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">-                <?php if ( is_search() ) : // Only display Excerpts for Search ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <?php if ( is_search() ) : // Only display excerpts for search. ?>

</ins><span class="cx" style="display: block; padding: 0 10px">                 <div class="entry-summary">

</span><span class="cx" style="display: block; padding: 0 10px">                        <?php the_excerpt(); ?>

</span><span class="cx" style="display: block; padding: 0 10px">                </div><!-- .entry-summary -->

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyelevencontentquotephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyeleven/content-quote.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyeleven/content-quote.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyeleven/content-quote.php  2020-01-29 00:43:23 UTC (rev 47122)

</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">                        <?php endif; ?>

</span><span class="cx" style="display: block; padding: 0 10px">                </header><!-- .entry-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">-                <?php if ( is_search() ) : // Only display Excerpts for Search ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <?php if ( is_search() ) : // Only display excerpts for search. ?>

</ins><span class="cx" style="display: block; padding: 0 10px">                 <div class="entry-summary">

</span><span class="cx" style="display: block; padding: 0 10px">                        <?php the_excerpt(); ?>

</span><span class="cx" style="display: block; padding: 0 10px">                </div><!-- .entry-summary -->

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -58,7 +58,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                $show_sep = true;

</span><span class="cx" style="display: block; padding: 0 10px">                                ?>

</span><span class="cx" style="display: block; padding: 0 10px">                        </span>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <?php endif; // End if categories ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <?php endif; // End if categories. ?>

</ins><span class="cx" style="display: block; padding: 0 10px">                         <?php

</span><span class="cx" style="display: block; padding: 0 10px">                                /* translators: Used between list items, there is a space after the comma. */

</span><span class="cx" style="display: block; padding: 0 10px">                                $tags_list = get_the_tag_list( '', __( ', ', 'twentyeleven' ) );

</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">                                if ( $show_sep ) :

</span><span class="cx" style="display: block; padding: 0 10px">                                        ?>

</span><span class="cx" style="display: block; padding: 0 10px">                        <span class="sep"> | </span>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <?php endif; // End if $show_sep ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <?php endif; // End if $show_sep. ?>

</ins><span class="cx" style="display: block; padding: 0 10px">                         <span class="tag-links">

</span><span class="cx" style="display: block; padding: 0 10px">                                <?php

</span><span class="cx" style="display: block; padding: 0 10px">                                /* translators: 1: CSS classes, 2: List of tags. */

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -74,14 +74,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                $show_sep = true;

</span><span class="cx" style="display: block; padding: 0 10px">                                ?>

</span><span class="cx" style="display: block; padding: 0 10px">                        </span>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <?php endif; // End if $tags_list ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <?php endif; // End if $tags_list. ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        <?php if ( comments_open() ) : ?>

</span><span class="cx" style="display: block; padding: 0 10px">                                <?php if ( $show_sep ) : ?>

</span><span class="cx" style="display: block; padding: 0 10px">                        <span class="sep"> | </span>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <?php endif; // End if $show_sep ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <?php endif; // End if $show_sep. ?>

</ins><span class="cx" style="display: block; padding: 0 10px">                         <span class="comments-link"><?php comments_popup_link( '<span class="leave-reply">' . __( 'Leave a reply', 'twentyeleven' ) . '</span>', __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?></span>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <?php endif; // End if comments_open() ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <?php endif; // End if comments_open(). ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        <?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>

</span><span class="cx" style="display: block; padding: 0 10px">                </footer><!-- .entry-meta -->

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyelevencontentsinglephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyeleven/content-single.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyeleven/content-single.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyeleven/content-single.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -61,7 +61,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        ?>

</span><span class="cx" style="display: block; padding: 0 10px">                <?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <?php if ( get_the_author_meta( 'description' ) && ( ! function_exists( 'is_multi_author' ) || is_multi_author() ) ) : // If a user has filled out their description and this is a multi-author blog, show a bio on their entries ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <?php

+               // If a user has filled out their description and this is a multi-author blog, show a bio on their entries.

+               if ( get_the_author_meta( 'description' ) && ( ! function_exists( 'is_multi_author' ) || is_multi_author() ) ) :

+                       ?>

</ins><span class="cx" style="display: block; padding: 0 10px">                 <div id="author-info">

</span><span class="cx" style="display: block; padding: 0 10px">                        <div id="author-avatar">

</span><span class="cx" style="display: block; padding: 0 10px">                                <?php

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyelevencontentstatusphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyeleven/content-status.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyeleven/content-status.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyeleven/content-status.php 2020-01-29 00:43:23 UTC (rev 47122)

</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">                        <?php endif; ?>

</span><span class="cx" style="display: block; padding: 0 10px">                </header><!-- .entry-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">-                <?php if ( is_search() ) : // Only display Excerpts for Search ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <?php if ( is_search() ) : // Only display excerpts for search. ?>

</ins><span class="cx" style="display: block; padding: 0 10px">                 <div class="entry-summary">

</span><span class="cx" style="display: block; padding: 0 10px">                        <?php the_excerpt(); ?>

</span><span class="cx" style="display: block; padding: 0 10px">                </div><!-- .entry-summary -->

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyelevencontentphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyeleven/content.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyeleven/content.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyeleven/content.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,7 +32,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        <?php endif; ?>

</span><span class="cx" style="display: block; padding: 0 10px">                </header><!-- .entry-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">-                <?php if ( is_search() ) : // Only display Excerpts for Search ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <?php if ( is_search() ) : // Only display excerpts for search. ?>

</ins><span class="cx" style="display: block; padding: 0 10px">                 <div class="entry-summary">

</span><span class="cx" style="display: block; padding: 0 10px">                        <?php the_excerpt(); ?>

</span><span class="cx" style="display: block; padding: 0 10px">                </div><!-- .entry-summary -->

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,7 +52,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                <footer class="entry-meta">

</span><span class="cx" style="display: block; padding: 0 10px">                        <?php $show_sep = false; ?>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <?php if ( is_object_in_taxonomy( get_post_type(), 'category' ) ) : // Hide category text when not supported ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <?php if ( is_object_in_taxonomy( get_post_type(), 'category' ) ) : // Hide category text when not supported. ?>

</ins><span class="cx" style="display: block; padding: 0 10px">                                 <?php

</span><span class="cx" style="display: block; padding: 0 10px">                                /* translators: Used between list items, there is a space after the comma. */

</span><span class="cx" style="display: block; padding: 0 10px">                                $categories_list = get_the_category_list( __( ', ', 'twentyeleven' ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,9 +65,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        $show_sep = true;

</span><span class="cx" style="display: block; padding: 0 10px">                                        ?>

</span><span class="cx" style="display: block; padding: 0 10px">                        </span>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <?php endif; // End if categories ?>

-                       <?php endif; // End if is_object_in_taxonomy( get_post_type(), 'category' ) ?>

-                       <?php if ( is_object_in_taxonomy( get_post_type(), 'post_tag' ) ) : // Hide tag text when not supported ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <?php endif; // End if categories. ?>

+                       <?php endif; // End if is_object_in_taxonomy( get_post_type(), 'category' ). ?>

+                       <?php if ( is_object_in_taxonomy( get_post_type(), 'post_tag' ) ) : // Hide tag text when not supported. ?>

</ins><span class="cx" style="display: block; padding: 0 10px">                                 <?php

</span><span class="cx" style="display: block; padding: 0 10px">                                /* translators: Used between list items, there is a space after the comma. */

</span><span class="cx" style="display: block; padding: 0 10px">                                $tags_list = get_the_tag_list( '', __( ', ', 'twentyeleven' ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,7 +75,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        if ( $show_sep ) :

</span><span class="cx" style="display: block; padding: 0 10px">                                                ?>

</span><span class="cx" style="display: block; padding: 0 10px">                        <span class="sep"> | </span>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <?php endif; // End if $show_sep ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <?php endif; // End if $show_sep. ?>

</ins><span class="cx" style="display: block; padding: 0 10px">                         <span class="tag-links">

</span><span class="cx" style="display: block; padding: 0 10px">                                        <?php

</span><span class="cx" style="display: block; padding: 0 10px">                                        /* translators: 1: CSS classes, 2: Tag list. */

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,15 +83,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        $show_sep = true;

</span><span class="cx" style="display: block; padding: 0 10px">                                        ?>

</span><span class="cx" style="display: block; padding: 0 10px">                        </span>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <?php endif; // End if $tags_list ?>

-                       <?php endif; // End if is_object_in_taxonomy( get_post_type(), 'post_tag' ) ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <?php endif; // End if $tags_list. ?>

+                       <?php endif; // End if is_object_in_taxonomy( get_post_type(), 'post_tag' ). ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        <?php if ( comments_open() ) : ?>

</span><span class="cx" style="display: block; padding: 0 10px">                                <?php if ( $show_sep ) : ?>

</span><span class="cx" style="display: block; padding: 0 10px">                        <span class="sep"> | </span>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <?php endif; // End if $show_sep ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <?php endif; // End if $show_sep. ?>

</ins><span class="cx" style="display: block; padding: 0 10px">                         <span class="comments-link"><?php comments_popup_link( '<span class="leave-reply">' . __( 'Leave a reply', 'twentyeleven' ) . '</span>', __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?></span>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <?php endif; // End if comments_open() ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <?php endif; // End if comments_open(). ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        <?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>

</span><span class="cx" style="display: block; padding: 0 10px">                </footer><!-- .entry-meta -->

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyelevenfunctionsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyeleven/functions.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyeleven/functions.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyeleven/functions.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,7 +27,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">  * <code>

</span><span class="cx" style="display: block; padding: 0 10px">  * add_action( 'after_setup_theme', 'my_child_theme_setup' );

</span><span class="cx" style="display: block; padding: 0 10px">  * function my_child_theme_setup() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *     // We are providing our own filter for excerpt_length (or using the unfiltered value)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *     // We are providing our own filter for excerpt_length (or using the unfiltered value).

</ins><span class="cx" style="display: block; padding: 0 10px">  *     remove_filter( 'excerpt_length', 'twentyeleven_excerpt_length' );

</span><span class="cx" style="display: block; padding: 0 10px">  *     ...

</span><span class="cx" style="display: block; padding: 0 10px">  * }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -143,7 +143,7 @@

<span class="cx" style="display: block; padding: 0 10px">                // This theme uses wp_nav_menu() in one location.

</span><span class="cx" style="display: block; padding: 0 10px">                register_nav_menu( 'primary', __( 'Primary Menu', 'twentyeleven' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Add support for a variety of post formats

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Add support for a variety of post formats.

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_theme_support( 'post-formats', array( 'aside', 'link', 'gallery', 'status', 'quote', 'image' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $theme_options = twentyeleven_get_theme_options();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -165,7 +165,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</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 theme uses Featured Images (also known as post thumbnails) for per-post/per-page Custom Header images

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // This theme uses Featured Images (also known as post thumbnails) for per-post/per-page Custom Header images.

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_theme_support( 'post-thumbnails' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Add support for custom headers.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -285,7 +285,7 @@

<span class="cx" style="display: block; padding: 0 10px">                // Indicate widget sidebars can use selective refresh in the Customizer.

</span><span class="cx" style="display: block; padding: 0 10px">                add_theme_support( 'customize-selective-refresh-widgets' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-endif; // twentyeleven_setup

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+endif; // twentyeleven_setup()

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> /**

<span class="cx" style="display: block; padding: 0 10px">  * Enqueue scripts and styles for front end.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -337,7 +337,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        clip: rect(1px, 1px, 1px, 1px);

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">                        <?php

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // If the user has set a custom color for the text use that

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // If the user has set a custom color for the text, use that.

</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">                #site-title a,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -348,7 +348,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        </style>

</span><span class="cx" style="display: block; padding: 0 10px">                <?php

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-endif; // twentyeleven_header_style

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+endif; // twentyeleven_header_style()

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! function_exists( 'twentyeleven_admin_header_style' ) ) :

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</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">                padding: 0 0 3em;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px">                <?php

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If the user has set a custom color for the text use that

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If the user has set a custom color for the text, use that.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( get_header_textcolor() != HEADER_TEXTCOLOR ) :

</span><span class="cx" style="display: block; padding: 0 10px">                        ?>

</span><span class="cx" style="display: block; padding: 0 10px">        #site-title a,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -398,7 +398,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        </style>

</span><span class="cx" style="display: block; padding: 0 10px">                <?php

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-endif; // twentyeleven_admin_header_style

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+endif; // twentyeleven_admin_header_style()

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! function_exists( 'twentyeleven_admin_header_image' ) ) :

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -428,7 +428,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                </div>

</span><span class="cx" style="display: block; padding: 0 10px">                <?php

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-endif; // twentyeleven_admin_header_image

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+endif; // twentyeleven_admin_header_image()

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> /**

<span class="cx" style="display: block; padding: 0 10px">  * Set the post excerpt length to 40 words.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -458,7 +458,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function twentyeleven_continue_reading_link() {

</span><span class="cx" style="display: block; padding: 0 10px">                return ' <a href="' . esc_url( get_permalink() ) . '">' . __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyeleven' ) . '</a>';

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-endif; // twentyeleven_continue_reading_link

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+endif; // twentyeleven_continue_reading_link()

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> /**

<span class="cx" style="display: block; padding: 0 10px">  * Replace "[...]" in the Read More link with an ellipsis.

</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">                        <?php

</span><span class="cx" style="display: block; padding: 0 10px">        endif;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-endif; // twentyeleven_content_nav

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+endif; // twentyeleven_content_nav()

</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 the first link from the post content. If none found, the

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -781,7 +781,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                break;

</span><span class="cx" style="display: block; padding: 0 10px">                endswitch;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-endif; // ends check for twentyeleven_comment()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+endif; // twentyeleven_comment()

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! function_exists( 'twentyeleven_posted_on' ) ) :

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -899,7 +899,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Fire the wp_body_open action.

</span><span class="cx" style="display: block; padding: 0 10px">         *

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Added for backwards compatibility to support pre 5.2.0 WordPress versions.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Added for backward compatibility to support pre-5.2.0 WordPress versions.

</ins><span class="cx" style="display: block; padding: 0 10px">          *

</span><span class="cx" style="display: block; padding: 0 10px">         * @since Twenty Eleven 3.3

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyelevenheaderphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyeleven/header.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyeleven/header.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyeleven/header.php 2020-01-29 00:43:23 UTC (rev 47122)

</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">                        </hgroup>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        <?php

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Check to see if the header image has been removed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Check to see if the header image has been removed.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $header_image = get_header_image();

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( $header_image ) :

<span class="cx" style="display: block; padding: 0 10px">                                // Compatibility with versions of WordPress prior to 3.4.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -121,10 +121,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        ?>

</span><span class="cx" style="display: block; padding: 0 10px">                                        <img src="<?php header_image(); ?>" width="<?php echo esc_attr( $header_image_width ); ?>" height="<?php echo esc_attr( $header_image_height ); ?>" alt="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" />

</span><span class="cx" style="display: block; padding: 0 10px">                                        <?php

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                } // end check for featured image or standard header

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         } // End check for featured image or standard header.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 ?>

</span><span class="cx" style="display: block; padding: 0 10px">                        </a>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <?php endif; // end check for removed header image ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <?php endif; // End check for removed header image. ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        <?php

<span class="cx" style="display: block; padding: 0 10px">                                // Has the text been hidden?

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -145,8 +145,14 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        <nav id="access" role="navigation">

</span><span class="cx" style="display: block; padding: 0 10px">                                <h3 class="assistive-text"><?php _e( 'Main menu', 'twentyeleven' ); ?></h3>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <?php /* Our navigation menu. If one isn't filled out, wp_nav_menu falls back to wp_page_menu. The menu assigned to the primary location is the one used. If one isn't assigned, the menu with the lowest ID is used. */ ?>

-                               <?php wp_nav_menu( array( 'theme_location' => 'primary' ) ); ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <?php

+                               /*

+                                * Our navigation menu. If one isn't filled out, wp_nav_menu() falls back to wp_page_menu().

+                                * The menu assigned to the primary location is the one used.

+                                * If one isn't assigned, the menu with the lowest ID is used.

+                                */

+                               wp_nav_menu( array( 'theme_location' => 'primary' ) );

+                               ?>

</ins><span class="cx" style="display: block; padding: 0 10px">                         </nav><!-- #access -->

</span><span class="cx" style="display: block; padding: 0 10px">        </header><!-- #branding -->

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyelevenimagephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyeleven/image.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyeleven/image.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyeleven/image.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,32 +75,34 @@

</span><span class="cx" style="display: 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 there is more than 1 attachment in a gallery

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // If there is more than 1 attachment in a gallery...

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( count( $attachments ) > 1 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        $k++;

</span><span class="cx" style="display: block; padding: 0 10px">                                        if ( isset( $attachments[ $k ] ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                // get the URL of the next image attachment

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         // ...get the URL of the next image attachment.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                 $next_attachment_url = get_attachment_link( $attachments[ $k ]->ID );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        } else {      // or get the URL of the first image attachment

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 } else {

+                                               // ...or get the URL of the first image attachment.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                 $next_attachment_url = get_attachment_link( $attachments[0]->ID );

</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">-                                        // or, if there's only 1 image, get the URL of the image

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Or, if there's only 1 image, get the URL of the image.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         $next_attachment_url = wp_get_attachment_url();

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px">                                ?>

</span><span class="cx" style="display: block; padding: 0 10px">                                                                        <a href="<?php echo esc_url( $next_attachment_url ); ?>" title="<?php the_title_attribute(); ?>" rel="attachment">

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                                                                                <?php

-                                                                                                               /**

-                                                                                                                * Filter the Twenty Eleven default attachment size.

-                                                                                                                *

-                                                                                                                * @since Twenty Eleven 1.0

-                                                                                                                *

-                                                                                                                * @param int The height and width attachment size dimensions in pixels. Default 848.

-                                                                                                                */

-                                                                                                               $attachment_size = apply_filters( 'twentyeleven_attachment_size', 848 );

-                                                                                                               echo wp_get_attachment_image( $post->ID, array( $attachment_size, 1024 ) ); // filterable image width with 1024px limit for image height.

-                                                                                                               ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                                         <?php

+                                                                               /**

+                                                                                * Filter the Twenty Eleven default attachment size.

+                                                                                *

+                                                                                * @since Twenty Eleven 1.0

+                                                                                *

+                                                                                * @param int The height and width attachment size dimensions in pixels. Default 848.

+                                                                                */

+                                                                               $attachment_size = apply_filters( 'twentyeleven_attachment_size', 848 );

+                                                                               // Filterable image width with 1024px limit for image height.

+                                                                               echo wp_get_attachment_image( $post->ID, array( $attachment_size, 1024 ) );

+                                                                               ?>

</ins><span class="cx" style="display: block; padding: 0 10px">                                                                         </a>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                                                        <?php if ( ! empty( $post->post_excerpt ) ) : ?>

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -130,7 +132,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                        <?php comments_template(); ?>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <?php endwhile; // end of the loop. ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <?php endwhile; // End of the loop. ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        </div><!-- #content -->

</span><span class="cx" style="display: block; padding: 0 10px">                </div><!-- #primary -->

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyelevenincthemecustomizerjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyeleven/inc/theme-customizer.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyeleven/inc/theme-customizer.js  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyeleven/inc/theme-customizer.js    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,7 +10,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                } );

</span><span class="cx" style="display: block; padding: 0 10px">        } );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Header text color

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Header text color.

</ins><span class="cx" style="display: block; padding: 0 10px">         wp.customize( 'header_textcolor', function( value ) {

</span><span class="cx" style="display: block; padding: 0 10px">                value.bind( function( to ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( 'blank' === to ) {

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyelevenincthemeoptionsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyeleven/inc/theme-options.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyeleven/inc/theme-options.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyeleven/inc/theme-options.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,26 +37,26 @@

</span><span class="cx" style="display: block; padding: 0 10px"> function twentyeleven_theme_options_init() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        register_setting(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                'twentyeleven_options',       // Options group, see settings_fields() call in twentyeleven_theme_options_render_page()

-               'twentyeleven_theme_options', // Database option, see twentyeleven_get_theme_options()

-               'twentyeleven_theme_options_validate' // The sanitization callback, see twentyeleven_theme_options_validate()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         'twentyeleven_options',               // Options group, see settings_fields() call in twentyeleven_theme_options_render_page().

+               'twentyeleven_theme_options',         // Database option, see twentyeleven_get_theme_options().

+               'twentyeleven_theme_options_validate' // The sanitization callback, see twentyeleven_theme_options_validate().

</ins><span class="cx" style="display: block; padding: 0 10px">         );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Register our settings field group

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Register our settings field group.

</ins><span class="cx" style="display: block; padding: 0 10px">         add_settings_section(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                'general', // Unique identifier for the settings section

-               '', // Section title (we don't want one)

-               '__return_false', // Section callback (we don't want anything)

-               'theme_options' // Menu slug, used to uniquely identify the page; see twentyeleven_theme_options_add_page()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         'general',        // Unique identifier for the settings section.

+               '',               // Section title (we don't want one).

+               '__return_false', // Section callback (we don't want anything).

+               'theme_options'   // Menu slug, used to uniquely identify the page; see twentyeleven_theme_options_add_page().

</ins><span class="cx" style="display: block; padding: 0 10px">         );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Register our individual settings fields

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Register our individual settings fields.

</ins><span class="cx" style="display: block; padding: 0 10px">         add_settings_field(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                'color_scheme',                             // Unique identifier for the field for this section

-               __( 'Color Scheme', 'twentyeleven' ),       // Setting field label

-               'twentyeleven_settings_field_color_scheme', // Function that renders the settings field

-               'theme_options',                            // Menu slug, used to uniquely identify the page; see twentyeleven_theme_options_add_page()

-               'general'                                   // Settings section. Same as the first argument in the add_settings_section() above

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         'color_scheme',                             // Unique identifier for the field for this section.

+               __( 'Color Scheme', 'twentyeleven' ),       // Setting field label.

+               'twentyeleven_settings_field_color_scheme', // Function that renders the settings field.

+               'theme_options',                            // Menu slug, used to uniquely identify the page; see twentyeleven_theme_options_add_page().

+               'general'                                   // Settings section. Same as the first argument in the add_settings_section() above.

</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">        add_settings_field( 'link_color', __( 'Link Color', 'twentyeleven' ), 'twentyeleven_settings_field_link_color', 'theme_options', 'general' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -92,11 +92,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function twentyeleven_theme_options_add_page() {

</span><span class="cx" style="display: block; padding: 0 10px">        $theme_page = add_theme_page(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                __( 'Theme Options', 'twentyeleven' ),   // Name of page

-               __( 'Theme Options', 'twentyeleven' ),   // Label in menu

-               'edit_theme_options',                    // Capability required

-               'theme_options',                         // Menu slug, used to uniquely identify the page

-               'twentyeleven_theme_options_render_page' // Function that renders the options page

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         __( 'Theme Options', 'twentyeleven' ),   // Name of page.

+               __( 'Theme Options', 'twentyeleven' ),   // Label in menu.

+               'edit_theme_options',                    // Capability required.

+               'theme_options',                         // Menu slug, used to uniquely identify the page.

+               'twentyeleven_theme_options_render_page' // Function that renders the options 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">        if ( ! $theme_page ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,7 +124,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $screen = get_current_screen();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( method_exists( $screen, 'add_help_tab' ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // WordPress 3.3.0

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // WordPress 3.3.0.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $screen->add_help_tab(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'title'   => __( 'Overview', 'twentyeleven' ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -135,7 +135,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $screen->set_help_sidebar( $sidebar );

</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">-                // WordPress 3.2.0

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // WordPress 3.2.0.

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_contextual_help( $screen, $help . $sidebar );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -378,7 +378,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $defaults = twentyeleven_get_default_theme_options();

</span><span class="cx" style="display: block; padding: 0 10px">        $output   = $defaults;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Color scheme must be in our array of color scheme options

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Color scheme must be in our array of color scheme options.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( isset( $input['color_scheme'] ) && array_key_exists( $input['color_scheme'], twentyeleven_color_schemes() ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $output['color_scheme'] = $input['color_scheme'];

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -387,12 +387,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $defaults['link_color'] = twentyeleven_get_default_link_color( $output['color_scheme'] );

</span><span class="cx" style="display: block; padding: 0 10px">        $output['link_color']   = $defaults['link_color'];

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Link color must be 3 or 6 hexadecimal characters

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Link color must be 3 or 6 hexadecimal characters.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( isset( $input['link_color'] ) && preg_match( '/^#?([a-f0-9]{3}){1,2}$/i', $input['link_color'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $output['link_color'] = '#' . strtolower( ltrim( $input['link_color'], '#' ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Theme layout must be in our array of theme layout options

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Theme layout must be in our array of theme layout options.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( isset( $input['theme_layout'] ) && array_key_exists( $input['theme_layout'], twentyeleven_layouts() ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $output['theme_layout'] = $input['theme_layout'];

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -582,7 +582,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                )

</span><span class="cx" style="display: block; padding: 0 10px">        );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Link Color (added to Color Scheme section in Customizer)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Link Color (added to Color Scheme section in Customizer).

</ins><span class="cx" style="display: block; padding: 0 10px">         $wp_customize->add_setting(

</span><span class="cx" style="display: block; padding: 0 10px">                'twentyeleven_theme_options[link_color]',

</span><span class="cx" style="display: block; padding: 0 10px">                array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -605,7 +605,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                )

</span><span class="cx" style="display: block; padding: 0 10px">        );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Default Layout

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Default Layout.

</ins><span class="cx" style="display: block; padding: 0 10px">         $wp_customize->add_section(

</span><span class="cx" style="display: block; padding: 0 10px">                'twentyeleven_layout',

</span><span class="cx" style="display: block; padding: 0 10px">                array(

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyelevenincwidgetsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyeleven/inc/widgets.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyeleven/inc/widgets.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyeleven/inc/widgets.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -137,10 +137,10 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        echo $args['after_widget'];

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Reset the post globals as this query will have stomped on it

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Reset the post globals as this query will have stomped on it.

</ins><span class="cx" style="display: block; padding: 0 10px">                         wp_reset_postdata();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // end check for ephemeral posts

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // End check for ephemeral posts.

</ins><span class="cx" style="display: block; padding: 0 10px">                 endif;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $cache[ $args['widget_id'] ] = ob_get_flush();

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyelevenindexphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyeleven/index.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyeleven/index.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyeleven/index.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,8 +21,8 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                <?php twentyeleven_content_nav( 'nav-above' ); ?>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <?php /* Start the Loop */ ?>

</del><span class="cx" style="display: block; padding: 0 10px">                                 <?php

<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                // Start the Loop.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 while ( have_posts() ) :

</span><span class="cx" style="display: block; padding: 0 10px">                                        the_post();

</span><span class="cx" style="display: block; padding: 0 10px">                                        ?>

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyelevenpagephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyeleven/page.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyeleven/page.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyeleven/page.php   2020-01-29 00:43:23 UTC (rev 47122)

</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">                                        <?php comments_template( '', true ); ?>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <?php endwhile; // end of the loop. ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <?php endwhile; // End of the loop. ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        </div><!-- #content -->

</span><span class="cx" style="display: block; padding: 0 10px">                </div><!-- #primary -->

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyelevensearchphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyeleven/search.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyeleven/search.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyeleven/search.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,8 +25,8 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                <?php twentyeleven_content_nav( 'nav-above' ); ?>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <?php /* Start the Loop */ ?>

</del><span class="cx" style="display: block; padding: 0 10px">                                 <?php

<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                // Start the Loop.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 while ( have_posts() ) :

</span><span class="cx" style="display: block; padding: 0 10px">                                        the_post();

</span><span class="cx" style="display: block; padding: 0 10px">                                        ?>

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyelevenshowcasephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyeleven/showcase.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyeleven/showcase.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyeleven/showcase.php       2020-01-29 00:43:23 UTC (rev 47122)

</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">  * @since Twenty Eleven 1.0

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Enqueue showcase script for the slider

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Enqueue showcase script for the slider.

</ins><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script( 'twentyeleven-showcase', get_template_directory_uri() . '/js/showcase.js', array( 'jquery' ), '20110429' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> get_header(); ?>

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,7 +62,7 @@

<span class="cx" style="display: block; padding: 0 10px">                                        // The Featured Posts query.

</span><span class="cx" style="display: block; padding: 0 10px">                                        $featured = new WP_Query( $featured_args );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Proceed only if published posts exist

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Proceed only if published posts exist.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         if ( $featured->have_posts() ) :

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                                /*

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,13 +91,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                                        $counter_slider++;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                                        /*

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                        * We're going to add a class to our featured post for featured images

-                                                       * by default it'll have the feature-text class.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 * We're going to add a class to our featured post for featured images.

+                                                       * By default it will have the feature-text class.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                         */

</span><span class="cx" style="display: block; padding: 0 10px">                                                        $feature_class = 'feature-text';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                                        if ( has_post_thumbnail() ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                                // ... but if it has a featured image let's add some class

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                         // ...but if it has a featured image let's add some class.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                                 $feature_class = 'feature-image small';

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                                                                // Hang on. Let's check this here image out.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -144,10 +144,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        <ul>

</span><span class="cx" style="display: block; padding: 0 10px">                                                        <?php

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                        // Reset the counter so that we end up with matching elements

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 // Reset the counter so that we end up with matching elements.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                         $counter_slider = 0;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                        // Begin from zero

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 // Begin from zero.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                         rewind_posts();

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                                                        // Let's roll again.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -195,7 +195,7 @@

<span class="cx" style="display: block; padding: 0 10px">                                        // Our new query for the Recent Posts section.

</span><span class="cx" style="display: block; padding: 0 10px">                                        $recent = new WP_Query( $recent_args );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // The first Recent post is displayed normally

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // The first Recent post is displayed normally.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         if ( $recent->have_posts() ) :

</span><span class="cx" style="display: block; padding: 0 10px">                                                $recent->the_post();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -224,7 +224,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                                <?php

</span><span class="cx" style="display: block; padding: 0 10px">                                        endwhile;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // If we had some posts, close the <ol>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // If we had some posts, close the <ol>.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         if ( $recent->post_count > 0 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                echo '</ol>';

</span><span class="cx" style="display: block; padding: 0 10px">                                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -245,7 +245,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                                );

</span><span class="cx" style="display: block; padding: 0 10px">                                                ?>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <?php endif; // end sidebar widget area ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <?php endif; // End sidebar widget area. ?>

</ins><span class="cx" style="display: block; padding: 0 10px">                                 </div><!-- .widget-area -->

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        </div><!-- #content -->

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyelevensidebarpagephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyeleven/sidebar-page.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyeleven/sidebar-page.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyeleven/sidebar-page.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,7 +23,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                        <?php comments_template( '', true ); ?>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <?php endwhile; // end of the loop. ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <?php endwhile; // End of the loop. ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        </div><!-- #content -->

</span><span class="cx" style="display: block; padding: 0 10px">                </div><!-- #primary -->

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyelevensidebarphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyeleven/sidebar.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyeleven/sidebar.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyeleven/sidebar.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,6 +31,6 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        </ul>

</span><span class="cx" style="display: block; padding: 0 10px">                                </aside>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <?php endif; // end sidebar widget area ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <?php endif; // End sidebar widget area. ?>

</ins><span class="cx" style="display: block; padding: 0 10px">                 </div><!-- #secondary .widget-area -->

</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyelevensinglephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyeleven/single.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyeleven/single.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyeleven/single.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,7 +27,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                        <?php comments_template( '', true ); ?>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <?php endwhile; // end of the loop. ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <?php endwhile; // End of the loop. ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        </div><!-- #content -->

</span><span class="cx" style="display: block; padding: 0 10px">                </div><!-- #primary -->

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyeleventagphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyeleven/tag.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyeleven/tag.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyeleven/tag.php    2020-01-29 00:43:23 UTC (rev 47122)

</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">                                <?php twentyeleven_content_nav( 'nav-above' ); ?>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <?php /* Start the Loop */ ?>

</del><span class="cx" style="display: block; padding: 0 10px">                                 <?php

<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                // Start the Loop.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 while ( have_posts() ) :

</span><span class="cx" style="display: block; padding: 0 10px">                                        the_post();

</span><span class="cx" style="display: block; padding: 0 10px">                                        ?>

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyfifteenarchivephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfifteen/archive.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfifteen/archive.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyfifteen/archive.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,14 +31,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        </header><!-- .page-header -->

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        <?php

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Start the Loop.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Start the loop.

</ins><span class="cx" style="display: block; padding: 0 10px">                         while ( have_posts() ) :

</span><span class="cx" style="display: block; padding: 0 10px">                                the_post();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                /*

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                 * Include the Post-Format-specific template for the content.

-                                * If you want to override this in a child theme, then include a file

-                                * called content-___.php (where ___ is the Post Format name) and that will be used instead.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                          * Include the post format-specific template for the content. If you want

+                                * to use this in a child theme, then include a file called content-___.php

+                                * (where ___ is the post format) and that will be used instead.

</ins><span class="cx" style="display: block; padding: 0 10px">                                  */

</span><span class="cx" style="display: block; padding: 0 10px">                                get_template_part( 'content', get_post_format() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyfifteencommentsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfifteen/comments.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfifteen/comments.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyfifteen/comments.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,7 +65,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        <?php endif; // have_comments() ?>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        <?php

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If comments are closed and there are comments, let's leave a little note, shall we?

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If comments are closed and there are comments, let's leave a little note, shall we?

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! comments_open() && get_comments_number() && post_type_supports( get_post_type(), 'comments' ) ) :

</span><span class="cx" style="display: block; padding: 0 10px">                ?>

</span><span class="cx" style="display: block; padding: 0 10px">        <p class="no-comments"><?php _e( 'Comments are closed.', 'twentyfifteen' ); ?></p>

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyfifteencontentlinkphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfifteen/content-link.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfifteen/content-link.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyfifteen/content-link.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,7 +49,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        <!-- .entry-content -->

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        <?php

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Author bio.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Author bio.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( is_single() && get_the_author_meta( 'description' ) ) :

</span><span class="cx" style="display: block; padding: 0 10px">                get_template_part( 'author-bio' );

</span><span class="cx" style="display: block; padding: 0 10px">                endif;

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyfifteencontentphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfifteen/content.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfifteen/content.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyfifteen/content.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,7 +50,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        </div><!-- .entry-content -->

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        <?php

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Author bio.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Author bio.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( is_single() && get_the_author_meta( 'description' ) ) :

</span><span class="cx" style="display: block; padding: 0 10px">                get_template_part( 'author-bio' );

</span><span class="cx" style="display: block; padding: 0 10px">                endif;

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyfifteenfunctionsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfifteen/functions.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfifteen/functions.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyfifteen/functions.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -252,7 +252,7 @@

<span class="cx" style="display: block; padding: 0 10px">                // Indicate widget sidebars can use selective refresh in the Customizer.

</span><span class="cx" style="display: block; padding: 0 10px">                add_theme_support( 'customize-selective-refresh-widgets' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-endif; // twentyfifteen_setup

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+endif; // twentyfifteen_setup()

</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'after_setup_theme', 'twentyfifteen_setup' );

</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="trunksrcwpcontentthemestwentyfifteenimagephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfifteen/image.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfifteen/image.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyfifteen/image.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,7 +13,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                <main id="main" class="site-main" role="main">

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        <?php

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Start the loop.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Start the loop.

</ins><span class="cx" style="display: block; padding: 0 10px">                         while ( have_posts() ) :

</span><span class="cx" style="display: block; padding: 0 10px">                                the_post();

</span><span class="cx" style="display: block; padding: 0 10px">                                ?>

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,7 +77,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                </article><!-- #post-<?php the_ID(); ?> -->

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                <?php

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // If comments are open or we have at least one comment, load up the comment template

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // If comments are open or we have at least one comment, load up the comment template.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( comments_open() || get_comments_number() ) :

</span><span class="cx" style="display: block; padding: 0 10px">                                        comments_template();

</span><span class="cx" style="display: block; padding: 0 10px">                                        endif;

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyfifteeninccustomheaderphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfifteen/inc/custom-header.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfifteen/inc/custom-header.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyfifteen/inc/custom-header.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -193,7 +193,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        </style>

</span><span class="cx" style="display: block; padding: 0 10px">                <?php

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-endif; // twentyfifteen_header_style

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+endif; // twentyfifteen_header_style()

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> /**

<span class="cx" style="display: block; padding: 0 10px">  * Enqueues front-end CSS for the header background color.

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyfifteeninccustomizerphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfifteen/inc/customizer.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfifteen/inc/customizer.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyfifteen/inc/customizer.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -266,7 +266,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                return $color_schemes['default']['colors'];

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-endif; // twentyfifteen_get_color_scheme

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+endif; // twentyfifteen_get_color_scheme()

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! function_exists( 'twentyfifteen_get_color_scheme_choices' ) ) :

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -286,7 +286,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                return $color_scheme_control_options;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-endif; // twentyfifteen_get_color_scheme_choices

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+endif; // twentyfifteen_get_color_scheme_choices()

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! function_exists( 'twentyfifteen_sanitize_color_scheme' ) ) :

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -306,7 +306,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                return $value;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-endif; // twentyfifteen_sanitize_color_scheme

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+endif; // twentyfifteen_sanitize_color_scheme()

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> /**

<span class="cx" style="display: block; padding: 0 10px">  * Enqueues front-end CSS for color scheme.

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyfifteeninctemplatetagsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfifteen/inc/template-tags.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfifteen/inc/template-tags.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyfifteen/inc/template-tags.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -163,10 +163,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( $all_the_cool_cats > 1 || is_preview() ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // This blog has more than 1 category so twentyfifteen_categorized_blog should return true.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // This blog has more than 1 category so twentyfifteen_categorized_blog() should return true.

</ins><span class="cx" style="display: block; padding: 0 10px">                 return true;

</span><span class="cx" style="display: block; padding: 0 10px">        } else {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // This blog has only 1 category so twentyfifteen_categorized_blog should return false.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // This blog has only 1 category so twentyfifteen_categorized_blog() should return false.

</ins><span class="cx" style="display: block; padding: 0 10px">                 return false;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -213,7 +213,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        </a>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                <?php

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        endif; // End is_singular()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ endif; // End is_singular().

</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -275,7 +275,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Fire the wp_body_open action.

</span><span class="cx" style="display: block; padding: 0 10px">         *

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Added for backwards compatibility to support pre 5.2.0 WordPress versions.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Added for backward compatibility to support pre-5.2.0 WordPress versions.

</ins><span class="cx" style="display: block; padding: 0 10px">          *

</span><span class="cx" style="display: block; padding: 0 10px">         * @since Twenty Fifteen 2.5

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyfifteenindexphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfifteen/index.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfifteen/index.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyfifteen/index.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,9 +33,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                the_post();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                /*

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                 * Include the Post-Format-specific template for the content.

-                                * If you want to override this in a child theme, then include a file

-                                * called content-___.php (where ___ is the Post Format name) and that will be used instead.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                          * Include the post format-specific template for the content. If you want

+                                * to use this in a child theme, then include a file called content-___.php

+                                * (where ___ is the post format) and that will be used instead.

</ins><span class="cx" style="display: block; padding: 0 10px">                                  */

</span><span class="cx" style="display: block; padding: 0 10px">                                get_template_part( 'content', get_post_format() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyfifteenjsfunctionsjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfifteen/js/functions.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfifteen/js/functions.js 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyfifteen/js/functions.js   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -79,6 +79,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * Uses jQuery's width() function to determine the size of the window and add

<span class="cx" style="display: block; padding: 0 10px">         * the default ARIA attributes for the menu toggle if it's visible.

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         *

</ins><span class="cx" style="display: block; padding: 0 10px">          * @since Twenty Fifteen 1.1

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function onResizeARIA() {

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyfifteensinglephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfifteen/single.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfifteen/single.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyfifteen/single.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,8 +18,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        the_post();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        /*

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                         * Include the post format-specific template for the content. If you want to

-                        * use this in a child theme, then include a file called content-___.php

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                  * Include the post format-specific template for the content. If you want

+                        * to use this in a child theme, then include a file called content-___.php

</ins><span class="cx" style="display: block; padding: 0 10px">                          * (where ___ is the post format) and that will be used instead.

</span><span class="cx" style="display: block; padding: 0 10px">                         */

</span><span class="cx" style="display: block; padding: 0 10px">                        get_template_part( 'content', get_post_format() );

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyfourteenarchivephp"></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/archive.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/archive.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyfourteen/archive.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,13 +44,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        </header><!-- .page-header -->

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                <?php

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Start the Loop.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Start the Loop.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 while ( have_posts() ) :

</span><span class="cx" style="display: block; padding: 0 10px">                                        the_post();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                        /*

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                         * Include the post format-specific template for the content. If you want to

-                                        * use this in a child theme, then include a file called content-___.php

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                  * Include the post format-specific template for the content. If you want

+                                        * to use this in a child theme, then include a file called content-___.php

</ins><span class="cx" style="display: block; padding: 0 10px">                                          * (where ___ is the post format) and that will be used instead.

</span><span class="cx" style="display: block; padding: 0 10px">                                         */

</span><span class="cx" style="display: block; padding: 0 10px">                                        get_template_part( 'content', get_post_format() );

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyfourteenauthorphp"></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/author.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/author.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyfourteen/author.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,19 +39,19 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                <?php

</span><span class="cx" style="display: block; padding: 0 10px">                                        /*

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                         * Since we called the_post() above, we need to rewind

-                                        * the loop back to the beginning that way we can run

-                                        * the loop properly, in full.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                  * Since we called the_post() above, we need

+                                        * to rewind the loop back to the beginning.

+                                        * That way we can run the loop properly, in full.

</ins><span class="cx" style="display: block; padding: 0 10px">                                          */

</span><span class="cx" style="display: block; padding: 0 10px">                                        rewind_posts();

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Start the Loop.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Start the Loop.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 while ( have_posts() ) :

</span><span class="cx" style="display: block; padding: 0 10px">                                        the_post();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                        /*

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                         * Include the post format-specific template for the content. If you want to

-                                        * use this in a child theme, then include a file called content-___.php

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                  * Include the post format-specific template for the content. If you want

+                                        * to use this in a child theme, then include a file called content-___.php

</ins><span class="cx" style="display: block; padding: 0 10px">                                          * (where ___ is the post format) and that will be used instead.

</span><span class="cx" style="display: block; padding: 0 10px">                                         */

</span><span class="cx" style="display: block; padding: 0 10px">                                        get_template_part( 'content', get_post_format() );

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyfourteencategoryphp"></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/category.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/category.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyfourteen/category.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,13 +34,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        </header><!-- .archive-header -->

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                <?php

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Start the Loop.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Start the Loop.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 while ( have_posts() ) :

</span><span class="cx" style="display: block; padding: 0 10px">                                        the_post();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                        /*

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        * Include the post format-specific template for the content. If you want to

-                                       * use this in a child theme, then include a file called content-___.php

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 * Include the post format-specific template for the content. If you want

+                                       * to use this in a child theme, then include a file called content-___.php

</ins><span class="cx" style="display: block; padding: 0 10px">                                         * (where ___ is the post format) and that will be used instead.

</span><span class="cx" style="display: block; padding: 0 10px">                                        */

</span><span class="cx" style="display: block; padding: 0 10px">                                        get_template_part( 'content', get_post_format() );

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyfourteencontentfeaturedpostphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfourteen/content-featured-post.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/content-featured-post.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyfourteen/content-featured-post.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,7 +11,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>

</span><span class="cx" style="display: block; padding: 0 10px">        <a class="post-thumbnail" href="<?php the_permalink(); ?>">

</span><span class="cx" style="display: block; padding: 0 10px">        <?php

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Output the featured image.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Output the featured image.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( has_post_thumbnail() ) :

</span><span class="cx" style="display: block; padding: 0 10px">                if ( 'grid' == get_theme_mod( 'featured_content_layout' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        the_post_thumbnail();

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyfourteenfunctionsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfourteen/functions.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/functions.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyfourteen/functions.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -192,7 +192,7 @@

<span class="cx" style="display: block; padding: 0 10px">                // Indicate widget sidebars can use selective refresh in the Customizer.

</span><span class="cx" style="display: block; padding: 0 10px">                add_theme_support( 'customize-selective-refresh-widgets' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-endif; // twentyfourteen_setup

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+endif; // twentyfourteen_setup()

</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'after_setup_theme', 'twentyfourteen_setup' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -455,11 +455,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // get the URL of the next image attachment...

</del><span class="cx" style="display: block; padding: 0 10px">                         if ( $next_id ) {

<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                // ...get the URL of the next image attachment.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $next_attachment_url = get_attachment_link( $next_id );

</span><span class="cx" style="display: block; padding: 0 10px">                        } else {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // or get the URL of the first image attachment.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // ...or get the URL of the first image attachment.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $next_attachment_url = get_attachment_link( reset( $attachment_ids ) );

</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="trunksrcwpcontentthemestwentyfourteenimagephp"></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/image.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/image.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyfourteen/image.php        2020-01-29 00:43:23 UTC (rev 47122)

</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">                <div id="content" class="site-content" role="main">

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        <?php

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Start the Loop.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Start the Loop.

</ins><span class="cx" style="display: block; padding: 0 10px">         while ( have_posts() ) :

</span><span class="cx" style="display: block; padding: 0 10px">                the_post();

</span><span class="cx" style="display: block; padding: 0 10px">                ?>

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,7 +72,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        <?php comments_template(); ?>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <?php endwhile; // end of the loop. ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <?php endwhile; // End of the loop. ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                </div><!-- #content -->

</span><span class="cx" style="display: block; padding: 0 10px">        </section><!-- #primary -->

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyfourteeninccustomheaderphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfourteen/inc/custom-header.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/inc/custom-header.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyfourteen/inc/custom-header.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,7 +91,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        </style>

</span><span class="cx" style="display: block; padding: 0 10px">                <?php

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-endif; // twentyfourteen_header_style

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+endif; // twentyfourteen_header_style()

</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 ( ! function_exists( 'twentyfourteen_admin_header_style' ) ) :

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -130,7 +130,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        </style>

</span><span class="cx" style="display: block; padding: 0 10px">                <?php

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-endif; // twentyfourteen_admin_header_style

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+endif; // twentyfourteen_admin_header_style()

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! function_exists( 'twentyfourteen_admin_header_image' ) ) :

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -150,4 +150,4 @@

</span><span class="cx" style="display: block; padding: 0 10px">        </div>

</span><span class="cx" style="display: block; padding: 0 10px">                <?php

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-endif; // twentyfourteen_admin_header_image

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+endif; // twentyfourteen_admin_header_image()

</ins></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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyfourteen/inc/template-tags.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -133,7 +133,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> function twentyfourteen_categorized_blog() {

</span><span class="cx" style="display: block; padding: 0 10px">        $all_the_cool_cats = get_transient( 'twentyfourteen_category_count' );

</span><span class="cx" style="display: block; padding: 0 10px">        if ( false === $all_the_cool_cats ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Create an array of all the categories that are attached to posts

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create an array of all the categories that are attached to posts.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $all_the_cool_cats = get_categories(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'hide_empty' => 1,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -140,7 +140,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">-                // Count the number of categories that are attached to the posts

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Count the number of categories that are attached to the posts.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $all_the_cool_cats = count( $all_the_cool_cats );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                set_transient( 'twentyfourteen_category_count', $all_the_cool_cats );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -147,10 +147,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( $all_the_cool_cats > 1 || is_preview() ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // This blog has more than 1 category so twentyfourteen_categorized_blog should return true

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // This blog has more than 1 category so twentyfourteen_categorized_blog() should return true.

</ins><span class="cx" style="display: block; padding: 0 10px">                 return true;

</span><span class="cx" style="display: block; padding: 0 10px">        } else {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // This blog has only 1 category so twentyfourteen_categorized_blog should return false

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // This blog has only 1 category so twentyfourteen_categorized_blog() should return false.

</ins><span class="cx" style="display: block; padding: 0 10px">                 return false;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -208,7 +208,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        </a>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        <?php

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        endif; // End is_singular()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ endif; // End is_singular().

</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -238,7 +238,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Fire the wp_body_open action.

</span><span class="cx" style="display: block; padding: 0 10px">         *

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Added for backwards compatibility to support pre 5.2.0 WordPress versions.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Added for backward compatibility to support pre-5.2.0 WordPress versions.

</ins><span class="cx" style="display: block; padding: 0 10px">          *

</span><span class="cx" style="display: block; padding: 0 10px">         * @since Twenty Fourteen 2.7

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyfourteenindexphp"></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/index.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/index.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyfourteen/index.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,8 +35,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                the_post();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                /*

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                 * Include the post format-specific template for the content. If you want to

-                                * use this in a child theme, then include a file called content-___.php

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                          * Include the post format-specific template for the content. If you want

+                                * to use this in a child theme, then include a file called content-___.php

</ins><span class="cx" style="display: block; padding: 0 10px">                                  * (where ___ is the post format) and that will be used instead.

</span><span class="cx" style="display: block; padding: 0 10px">                                 */

</span><span class="cx" style="display: block; padding: 0 10px">                                get_template_part( 'content', get_post_format() );

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyfourteenjsfunctionsjs"></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/js/functions.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/js/functions.js        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyfourteen/js/functions.js  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,5 @@

</span><span class="cx" style="display: block; padding: 0 10px"> /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Theme functions file

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Theme functions file.

</ins><span class="cx" style="display: block; padding: 0 10px">  *

</span><span class="cx" style="display: block; padding: 0 10px">  * Contains handlers for navigation, accessibility, header sizing

</span><span class="cx" style="display: block; padding: 0 10px">  * footer widgets and Featured Content slider

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -126,6 +126,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * Uses jQuery's width() function to determine the size of the window and add

<span class="cx" style="display: block; padding: 0 10px">         * the default ARIA attributes for the menu toggle if it's visible.

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         *

</ins><span class="cx" style="display: block; padding: 0 10px">          * @since Twenty Fourteen 1.4

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function onResizeARIA() {

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyfourteenpagetemplatescontributorsphp"></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/page-templates/contributors.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/page-templates/contributors.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyfourteen/page-templates/contributors.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,7 +21,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        <div id="primary" class="content-area">

</span><span class="cx" style="display: block; padding: 0 10px">                <div id="content" class="site-content" role="main">

</span><span class="cx" style="display: block; padding: 0 10px">                        <?php

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Start the Loop.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Start the Loop.

</ins><span class="cx" style="display: block; padding: 0 10px">                         while ( have_posts() ) :

</span><span class="cx" style="display: block; padding: 0 10px">                                the_post();

</span><span class="cx" style="display: block; padding: 0 10px">                                ?>

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyfourteenpagetemplatesfullwidthphp"></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/page-templates/full-width.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/page-templates/full-width.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyfourteen/page-templates/full-width.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,7 +21,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        <div id="primary" class="content-area">

</span><span class="cx" style="display: block; padding: 0 10px">                <div id="content" class="site-content" role="main">

</span><span class="cx" style="display: block; padding: 0 10px">                        <?php

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Start the Loop.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Start the Loop.

</ins><span class="cx" style="display: block; padding: 0 10px">                         while ( have_posts() ) :

</span><span class="cx" style="display: block; padding: 0 10px">                                the_post();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyfourteenpagephp"></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/page.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/page.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyfourteen/page.php 2020-01-29 00:43:23 UTC (rev 47122)

</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">                <div id="content" class="site-content" role="main">

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        <?php

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Start the Loop.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Start the Loop.

</ins><span class="cx" style="display: block; padding: 0 10px">                         while ( have_posts() ) :

</span><span class="cx" style="display: block; padding: 0 10px">                                the_post();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyfourteensearchphp"></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/search.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/search.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyfourteen/search.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,13 +24,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        </header><!-- .page-header -->

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                <?php

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Start the Loop.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Start the Loop.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 while ( have_posts() ) :

</span><span class="cx" style="display: block; padding: 0 10px">                                        the_post();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                        /*

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                         * Include the post format-specific template for the content. If you want to

-                                        * use this in a child theme, then include a file called content-___.php

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                  * Include the post format-specific template for the content. If you want

+                                        * to use this in a child theme, then include a file called content-___.php

</ins><span class="cx" style="display: block; padding: 0 10px">                                          * (where ___ is the post format) and that will be used instead.

</span><span class="cx" style="display: block; padding: 0 10px">                                         */

</span><span class="cx" style="display: block; padding: 0 10px">                                        get_template_part( 'content', get_post_format() );

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyfourteensinglephp"></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/single.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/single.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyfourteen/single.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,13 +12,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">        <div id="primary" class="content-area">

</span><span class="cx" style="display: block; padding: 0 10px">                <div id="content" class="site-content" role="main">

</span><span class="cx" style="display: block; padding: 0 10px">                        <?php

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Start the Loop.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Start the Loop.

</ins><span class="cx" style="display: block; padding: 0 10px">                         while ( have_posts() ) :

</span><span class="cx" style="display: block; padding: 0 10px">                                the_post();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                /*

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                 * Include the post format-specific template for the content. If you want to

-                                * use this in a child theme, then include a file called content-___.php

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                          * Include the post format-specific template for the content. If you want

+                                * to use this in a child theme, then include a file called content-___.php

</ins><span class="cx" style="display: block; padding: 0 10px">                                  * (where ___ is the post format) and that will be used instead.

</span><span class="cx" style="display: block; padding: 0 10px">                                 */

</span><span class="cx" style="display: block; padding: 0 10px">                                get_template_part( 'content', get_post_format() );

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyfourteentagphp"></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/tag.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/tag.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyfourteen/tag.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,13 +36,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        </header><!-- .archive-header -->

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                <?php

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Start the Loop.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Start the Loop.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 while ( have_posts() ) :

</span><span class="cx" style="display: block; padding: 0 10px">                                        the_post();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                        /*

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                         * Include the post format-specific template for the content. If you want to

-                                        * use this in a child theme, then include a file called content-___.php

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                  * Include the post format-specific template for the content. If you want

+                                        * to use this in a child theme, then include a file called content-___.php

</ins><span class="cx" style="display: block; padding: 0 10px">                                          * (where ___ is the post format) and that will be used instead.

</span><span class="cx" style="display: block; padding: 0 10px">                                         */

</span><span class="cx" style="display: block; padding: 0 10px">                                        get_template_part( 'content', get_post_format() );

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyfourteentaxonomypost_formatphp"></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/taxonomy-post_format.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/taxonomy-post_format.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyfourteen/taxonomy-post_format.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,13 +56,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        </header><!-- .archive-header -->

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                <?php

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Start the Loop.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Start the Loop.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 while ( have_posts() ) :

</span><span class="cx" style="display: block; padding: 0 10px">                                        the_post();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                        /*

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                         * Include the post format-specific template for the content. If you want to

-                                        * use this in a child theme, then include a file called content-___.php

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                  * Include the post format-specific template for the content. If you want

+                                        * to use this in a child theme, then include a file called content-___.php

</ins><span class="cx" style="display: block; padding: 0 10px">                                          * (where ___ is the post format) and that will be used instead.

</span><span class="cx" style="display: block; padding: 0 10px">                                         */

</span><span class="cx" style="display: block; padding: 0 10px">                                        get_template_part( 'content', get_post_format() );

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentynineteenarchivephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentynineteen/archive.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentynineteen/archive.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentynineteen/archive.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,7 +31,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                /*

<span class="cx" style="display: block; padding: 0 10px">                                 * Include the Post-Format-specific template for the content.

</span><span class="cx" style="display: block; padding: 0 10px">                                 * If you want to override this in a child theme, then include a file

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                 * called content-___.php (where ___ is the Post Format name) and that will be used instead.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                          * called content-___.php (where ___ is the Post Format name) and that

+                                * will be used instead.

</ins><span class="cx" style="display: block; padding: 0 10px">                                  */

</span><span class="cx" style="display: block; padding: 0 10px">                                get_template_part( 'template-parts/content/content', 'excerpt' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentynineteenclassesclasstwentynineteensvgiconsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentynineteen/classes/class-twentynineteen-svg-icons.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentynineteen/classes/class-twentynineteen-svg-icons.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentynineteen/classes/class-twentynineteen-svg-icons.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,7 +36,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $repl = sprintf( '<svg class="svg-icon" width="%d" height="%d" aria-hidden="true" role="img" focusable="false" ', $size, $size );

</span><span class="cx" style="display: block; padding: 0 10px">                        $svg  = preg_replace( '/^<svg /', $repl, trim( $arr[ $icon ] ) ); // Add extra attributes to SVG code.

</span><span class="cx" style="display: block; padding: 0 10px">                        $svg  = preg_replace( "/([\n\t]+)/", ' ', $svg ); // Remove newlines & tabs.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $svg  = preg_replace( '/>\s*</', '><', $svg ); // Remove white space between SVG tags.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $svg  = preg_replace( '/>\s*</', '><', $svg );    // Remove whitespace between SVG tags.

</ins><span class="cx" style="display: block; padding: 0 10px">                         return $svg;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">                return null;

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentynineteencommentsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentynineteen/comments.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentynineteen/comments.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentynineteen/comments.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,7 +56,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                ?>

</span><span class="cx" style="display: block; padding: 0 10px">                </h2><!-- .comments-title -->

</span><span class="cx" style="display: block; padding: 0 10px">                <?php

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Only show discussion meta information when comments are open and available.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Only show discussion meta information when comments are open and available.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( have_comments() && comments_open() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        get_template_part( 'template-parts/post/discussion', 'meta' );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -85,7 +85,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                </ol><!-- .comment-list -->

</span><span class="cx" style="display: block; padding: 0 10px">                <?php

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Show comment navigation

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Show comment navigation.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( have_comments() ) :

</span><span class="cx" style="display: block; padding: 0 10px">                        $prev_icon     = twentynineteen_get_icon_svg( 'chevron_left', 22 );

</span><span class="cx" style="display: block; padding: 0 10px">                        $next_icon     = twentynineteen_get_icon_svg( 'chevron_right', 22 );

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentynineteenimagephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentynineteen/image.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentynineteen/image.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentynineteen/image.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,7 +14,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                <main id="main" class="site-main">

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        <?php

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Start the loop.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Start the Loop.

</ins><span class="cx" style="display: block; padding: 0 10px">                         while ( have_posts() ) :

</span><span class="cx" style="display: block; padding: 0 10px">                                the_post();

</span><span class="cx" style="display: block; padding: 0 10px">                                ?>

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentynineteeninctemplatefunctionsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentynineteen/inc/template-functions.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentynineteen/inc/template-functions.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentynineteen/inc/template-functions.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -238,7 +238,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function twentynineteen_nav_menu_link_attributes( $atts, $item, $args, $depth ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Add [aria-haspopup] and [aria-expanded] to menu items that have children

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Add [aria-haspopup] and [aria-expanded] to menu items that have children.

</ins><span class="cx" style="display: block; padding: 0 10px">         $item_has_children = in_array( 'menu-item-has-children', $item->classes );

</span><span class="cx" style="display: block; padding: 0 10px">        if ( $item_has_children ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $atts['aria-haspopup'] = 'true';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -274,7 +274,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        twentynineteen_get_icon_svg( 'chevron_left', 24 )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // replace opening <a> with <button>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Replace opening <a> with <button>.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $output = preg_replace(

</span><span class="cx" style="display: block; padding: 0 10px">                        '/<a\s.*?>/',

</span><span class="cx" style="display: block; padding: 0 10px">                        $link,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -282,7 +282,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        1 // Limit.

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // replace closing </a> with </button>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Replace closing </a> with </button>.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $output = preg_replace(

</span><span class="cx" style="display: block; padding: 0 10px">                        '#</a>#i',

</span><span class="cx" style="display: block; padding: 0 10px">                        '</button>',

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentynineteeninctemplatetagsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentynineteen/inc/template-tags.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentynineteen/inc/template-tags.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentynineteen/inc/template-tags.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,10 +76,10 @@

<span class="cx" style="display: block; padding: 0 10px">                // Hide author, post date, category and tag text for pages.

</span><span class="cx" style="display: block; padding: 0 10px">                if ( 'post' === get_post_type() ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Posted by

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Posted by.

</ins><span class="cx" style="display: block; padding: 0 10px">                         twentynineteen_posted_by();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Posted on

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Posted on.

</ins><span class="cx" style="display: block; padding: 0 10px">                         twentynineteen_posted_on();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        /* translators: Used between list items, there is a space after the comma. */

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -243,7 +243,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Fire the wp_body_open action.

</span><span class="cx" style="display: block; padding: 0 10px">         *

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Added for backwards compatibility to support pre 5.2.0 WordPress versions.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Added for backward compatibility to support pre-5.2.0 WordPress versions.

</ins><span class="cx" style="display: block; padding: 0 10px">          *

</span><span class="cx" style="display: block; padding: 0 10px">         * @since Twenty Nineteen 1.4

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentynineteenjscustomizepreviewjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentynineteen/js/customize-preview.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentynineteen/js/customize-preview.js        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentynineteen/js/customize-preview.js  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,10 +18,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                color;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if( 'custom' === to ){

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // If a custom primary color is selected, use the currently set primary_color_hue

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // If a custom primary color is selected, use the currently set primary_color_hue.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 color = wp.customize.get().primary_color_hue;

</span><span class="cx" style="display: block; padding: 0 10px">                        } else {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // If the "default" option is selected, get the default primary_color_hue

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // If the "default" option is selected, get the default primary_color_hue.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 color = 199;

</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="trunksrcwpcontentthemestwentynineteenjsprioritymenujs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentynineteen/js/priority-menu.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentynineteen/js/priority-menu.js    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentynineteen/js/priority-menu.js      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,7 +1,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> (function() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Debounce

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Debounce.

</ins><span class="cx" style="display: block; padding: 0 10px">          *

</span><span class="cx" style="display: block; padding: 0 10px">         * @param {Function} func

</span><span class="cx" style="display: block; padding: 0 10px">         * @param {number} wait

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,7 +56,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @param {Element} element

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function showButton(element) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // classList.remove is not supported in IE11

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // classList.remove is not supported in IE11.

</ins><span class="cx" style="display: block; padding: 0 10px">                 element.className = element.className.replace('is-empty', '');

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,7 +66,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @param {Element} element

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function hideButton(element) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // classList.add is not supported in IE11

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // classList.add is not supported in IE11.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if (!element.classList.contains('is-empty')) {

</span><span class="cx" style="display: block; padding: 0 10px">                        element.className += ' is-empty';

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,13 +91,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Set menu container variable

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Set menu container variable.

</ins><span class="cx" style="display: block; padding: 0 10px">          */

</span><span class="cx" style="display: block; padding: 0 10px">        var navContainer = document.querySelector('.main-navigation');

</span><span class="cx" style="display: block; padding: 0 10px">        var breaks       = [];

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Let’s bail if we our menu doesn't exist

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Let’s bail if we our menu doesn't exist.

</ins><span class="cx" style="display: block; padding: 0 10px">          */

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! navContainer ) {

</span><span class="cx" style="display: block; padding: 0 10px">                return;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -104,12 +104,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Refreshes the list item from the menu depending on the menu size

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Refreshes the list item from the menu depending on the menu size.

</ins><span class="cx" style="display: block; padding: 0 10px">          */

</span><span class="cx" style="display: block; padding: 0 10px">        function updateNavigationMenu( container ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 * Let’s bail if our menu is empty

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+          * Let’s bail if our menu is empty.

</ins><span class="cx" style="display: block; padding: 0 10px">                  */

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! container.parentNode.querySelector('.main-menu[id]') ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -122,29 +122,29 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( isOverflowingNavivation( visibleList, toggleButton, container ) ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Record the width of the list

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Record the width of the list.

</ins><span class="cx" style="display: block; padding: 0 10px">                         breaks.push( visibleList.offsetWidth );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Move last item to the hidden list

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Move last item to the hidden list.

</ins><span class="cx" style="display: block; padding: 0 10px">                         prependElement( hiddenList, ! visibleList.lastChild || null === visibleList.lastChild ? visibleList.previousElementSibling : visibleList.lastChild );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Show the toggle button

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Show the toggle button.

</ins><span class="cx" style="display: block; padding: 0 10px">                         showButton( toggleButton );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                } else {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // There is space for another item in the nav

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // There is space for another item in the nav.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( getAvailableSpace( toggleButton, container ) > breaks[breaks.length - 1] ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Move the item to the visible list

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Move the item to the visible list.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 visibleList.appendChild( hiddenList.firstChild.nextSibling );

</span><span class="cx" style="display: block; padding: 0 10px">                                breaks.pop();

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Hide the dropdown btn if hidden list is empty

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Hide the dropdown btn if hidden list is empty.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if (breaks.length < 2) {

</span><span class="cx" style="display: block; padding: 0 10px">                                hideButton( toggleButton );

</span><span class="cx" style="display: 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">-                // Recur if the visible list is still overflowing the nav

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Recur if the visible list is still overflowing the nav.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( isOverflowingNavivation( visibleList, toggleButton, container ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        updateNavigationMenu( container );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -151,13 +151,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Run our priority+ function as soon as the document is `ready`

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Run our priority+ function as soon as the document is `ready`.

</ins><span class="cx" style="display: block; padding: 0 10px">          */

</span><span class="cx" style="display: block; padding: 0 10px">        document.addEventListener( 'DOMContentLoaded', function() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                updateNavigationMenu( navContainer );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Also, run our priority+ function on selective refresh in the customizer

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Also, run our priority+ function on selective refresh in the customizer.

</ins><span class="cx" style="display: block; padding: 0 10px">                 var hasSelectiveRefresh = (

</span><span class="cx" style="display: block; padding: 0 10px">                        'undefined' !== typeof wp &&

</span><span class="cx" style="display: block; padding: 0 10px">                        wp.customize &&

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -166,7 +166,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( hasSelectiveRefresh ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Re-run our priority+ function on Nav Menu partial refreshes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Re-run our priority+ function on Nav Menu partial refreshes.

</ins><span class="cx" style="display: block; padding: 0 10px">                         wp.customize.selectiveRefresh.bind( 'partial-content-rendered', function ( placement ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                var isNewNavMenu = (

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -184,7 +184,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        });

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Run our priority+ function on load

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Run our priority+ function on load.

</ins><span class="cx" style="display: block; padding: 0 10px">          */

</span><span class="cx" style="display: block; padding: 0 10px">        window.addEventListener( 'load', function() {

</span><span class="cx" style="display: block; padding: 0 10px">                updateNavigationMenu( navContainer );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -191,7 +191,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        });

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Run our priority+ function every time the window resizes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Run our priority+ function every time the window resizes.

</ins><span class="cx" style="display: block; padding: 0 10px">          */

</span><span class="cx" style="display: block; padding: 0 10px">        var isResizing = false;

</span><span class="cx" style="display: block; padding: 0 10px">        window.addEventListener( 'resize',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -209,7 +209,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Run our priority+ function

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Run our priority+ function.

</ins><span class="cx" style="display: block; padding: 0 10px">          */

</span><span class="cx" style="display: block; padding: 0 10px">        updateNavigationMenu( navContainer );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentynineteenjstouchkeyboardnavigationjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentynineteen/js/touch-keyboard-navigation.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentynineteen/js/touch-keyboard-navigation.js        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentynineteen/js/touch-keyboard-navigation.js  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,7 +7,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> (function() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Debounce

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Debounce.

</ins><span class="cx" style="display: block; padding: 0 10px">          *

</span><span class="cx" style="display: block; padding: 0 10px">         * @param {Function} func

</span><span class="cx" style="display: block; padding: 0 10px">         * @param {number} wait

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,7 +43,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Add class

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Add class.

</ins><span class="cx" style="display: block; padding: 0 10px">          *

</span><span class="cx" style="display: block; padding: 0 10px">         * @param {Object} el

</span><span class="cx" style="display: block; padding: 0 10px">         * @param {string} cls

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -55,7 +55,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Delete class

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Delete class.

</ins><span class="cx" style="display: block; padding: 0 10px">          *

</span><span class="cx" style="display: block; padding: 0 10px">         * @param {Object} el

</span><span class="cx" style="display: block; padding: 0 10px">         * @param {string} cls

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,7 +80,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Toggle Aria Expanded state for screenreaders

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Toggle Aria Expanded state for screenreaders.

</ins><span class="cx" style="display: block; padding: 0 10px">          *

</span><span class="cx" style="display: block; padding: 0 10px">         * @param {Object} ariaItem

</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">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Open sub-menu

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Open sub-menu.

</ins><span class="cx" style="display: block; padding: 0 10px">          *

</span><span class="cx" style="display: block; padding: 0 10px">         * @param {Object} currentSubMenu

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,17 +106,17 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function openSubMenu( currentSubMenu ) {

</span><span class="cx" style="display: block; padding: 0 10px">                'use strict';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Update classes

-               // classList.add is not supported in IE11

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Update classes.

+               // classList.add is not supported in IE11.

</ins><span class="cx" style="display: block; padding: 0 10px">                 currentSubMenu.parentElement.className += ' off-canvas';

</span><span class="cx" style="display: block; padding: 0 10px">                currentSubMenu.parentElement.lastElementChild.className += ' expanded-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">-                // Update aria-expanded state

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Update aria-expanded state.

</ins><span class="cx" style="display: block; padding: 0 10px">                 toggleAriaExpandedState( currentSubMenu );

</span><span class="cx" style="display: 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">-         * Close sub-menu

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Close sub-menu.

</ins><span class="cx" style="display: block; padding: 0 10px">          *

</span><span class="cx" style="display: block; padding: 0 10px">         * @param {Object} currentSubMenu

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -127,32 +127,32 @@

</span><span class="cx" style="display: block; padding: 0 10px">                var menuItemAria = menuItem.querySelector('a[aria-expanded]');

</span><span class="cx" style="display: block; padding: 0 10px">                var subMenu      = currentSubMenu.closest('.sub-menu');

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If this is in a sub-sub-menu, go back to parent sub-menu

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If this is in a sub-sub-menu, go back to parent sub-menu.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( getCurrentParent( currentSubMenu, 'ul' ).classList.contains( 'sub-menu' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Update classes

-                       // classList.remove is not supported in IE11

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Update classes.

+                       // classList.remove is not supported in IE11.

</ins><span class="cx" style="display: block; padding: 0 10px">                         menuItem.className = menuItem.className.replace( 'off-canvas', '' );

</span><span class="cx" style="display: block; padding: 0 10px">                        subMenu.className  = subMenu.className.replace( 'expanded-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">-                        // Update aria-expanded and :focus states

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Update aria-expanded and :focus states.

</ins><span class="cx" style="display: block; padding: 0 10px">                         toggleAriaExpandedState( menuItemAria );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Or else close all sub-menus

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Or else close all sub-menus.

</ins><span class="cx" style="display: block; padding: 0 10px">                 } else {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Update classes

-                       // classList.remove is not supported in IE11

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Update classes.

+                       // classList.remove is not supported in IE11.

</ins><span class="cx" style="display: block; padding: 0 10px">                         menuItem.className = menuItem.className.replace( 'off-canvas', '' );

</span><span class="cx" style="display: block; padding: 0 10px">                        menuItem.lastElementChild.className = menuItem.lastElementChild.className.replace( 'expanded-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">-                        // Update aria-expanded and :focus states

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Update aria-expanded and :focus states.

</ins><span class="cx" style="display: block; padding: 0 10px">                         toggleAriaExpandedState( menuItemAria );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Find first ancestor of an element by selector

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Find first ancestor of an element by selector.

</ins><span class="cx" style="display: block; padding: 0 10px">          *

</span><span class="cx" style="display: block; padding: 0 10px">         * @param {Object} child

</span><span class="cx" style="display: block; padding: 0 10px">         * @param {String} selector

</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"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Remove all off-canvas states

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Remove all off-canvas states.

</ins><span class="cx" style="display: block; padding: 0 10px">          */

</span><span class="cx" style="display: block; padding: 0 10px">        function removeAllFocusStates() {

</span><span class="cx" style="display: block; padding: 0 10px">                'use strict';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -202,7 +202,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Matches polyfill for IE11

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Matches polyfill for IE11.

</ins><span class="cx" style="display: block; padding: 0 10px">          */

</span><span class="cx" style="display: block; padding: 0 10px">        if (!Element.prototype.matches) {

</span><span class="cx" style="display: block; padding: 0 10px">                Element.prototype.matches = Element.prototype.msMatchesSelector;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -219,31 +219,31 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                var url = event.target.getAttribute( 'href' ) ? event.target.getAttribute( 'href' ) : '';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Open submenu if url is #

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Open submenu if URL is #.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( '#' === url && event.target.nextSibling.matches('.submenu-expand') ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        openSubMenu( event.target );

</span><span class="cx" style="display: 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">-                        // Check if .submenu-expand is touched

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Check if .submenu-expand is touched.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( event.target.matches('.submenu-expand') ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                openSubMenu(event.target);

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Check if child of .submenu-expand is touched

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Check if child of .submenu-expand is touched.

</ins><span class="cx" style="display: block; padding: 0 10px">                         } else if ( null != getCurrentParent( event.target, '.submenu-expand' ) &&

</span><span class="cx" style="display: block; padding: 0 10px">                                                                getCurrentParent( event.target, '.submenu-expand' ).matches( '.submenu-expand' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                openSubMenu( getCurrentParent( event.target, '.submenu-expand' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Check if .menu-item-link-return is touched

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Check if .menu-item-link-return is touched.

</ins><span class="cx" style="display: block; padding: 0 10px">                         } else if ( event.target.matches('.menu-item-link-return') ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                closeSubMenu( event.target );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Check if child of .menu-item-link-return is touched

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Check if child of .menu-item-link-return is touched.

</ins><span class="cx" style="display: block; padding: 0 10px">                         } else if ( null != getCurrentParent( event.target, '.menu-item-link-return' ) && getCurrentParent( event.target, '.menu-item-link-return' ).matches( '.menu-item-link-return' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                closeSubMenu( event.target );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Prevent default mouse/focus events

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Prevent default mouse/focus events.

</ins><span class="cx" style="display: block; padding: 0 10px">                         removeAllFocusStates();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                }, false);

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -253,7 +253,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        var mainNav = getCurrentParent( event.target, '.main-navigation' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( null != mainNav && hasClass( mainNav, '.main-navigation' ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Prevent default mouse events

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Prevent default mouse events.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 event.preventDefault();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        } else if (

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -263,11 +263,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                event.target.matches('.menu-item-link-return') ||

</span><span class="cx" style="display: block; padding: 0 10px">                                null != getCurrentParent( event.target, '.menu-item-link-return' ) &&

</span><span class="cx" style="display: block; padding: 0 10px">                                getCurrentParent( event.target, '.menu-item-link-return' ).matches( '.menu-item-link-return' ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Prevent default mouse events

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Prevent default mouse events.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         event.preventDefault();

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Prevent default mouse/focus events

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Prevent default mouse/focus events.

</ins><span class="cx" style="display: block; padding: 0 10px">                         removeAllFocusStates();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                }, false);

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -276,7 +276,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( event.target.matches('.main-navigation > div > ul > li a') ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Remove Focused elements in sibling div

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Remove Focused elements in sibling div.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 var currentDiv        = getCurrentParent( event.target, 'div', '.main-navigation' );

</span><span class="cx" style="display: block; padding: 0 10px">                                var currentDivSibling = currentDiv.previousElementSibling === null ? currentDiv.nextElementSibling : currentDiv.previousElementSibling;

</span><span class="cx" style="display: block; padding: 0 10px">                                var focusedElement    = currentDivSibling.querySelector( '.is-focused' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -288,17 +288,17 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        deleteClass( focusedElement, focusedClass );

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Add .is-focused class to top-level li

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Add .is-focused class to top-level li.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( getCurrentParent( event.target, '.main-navigation > div > ul > li', '.main-navigation' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        addClass( getCurrentParent( event.target, '.main-navigation > div > ul > li', '.main-navigation' ), focusedClass );

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Check for previous li

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Check for previous li.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( prevLi && hasClass( prevLi, focusedClass ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        deleteClass( prevLi, focusedClass );

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Check for next li

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Check for next li.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( nextLi && hasClass( nextLi, focusedClass ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        deleteClass( nextLi, focusedClass );

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -308,11 +308,11 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                document.addEventListener('click', function(event) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Remove all focused menu states when clicking outside site branding

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Remove all focused menu states when clicking outside site branding.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( event.target !== document.getElementsByClassName( 'site-branding' )[0] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                removeAllFocusStates();

</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">-                                // nothing

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Nothing.

</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">                }, false);

</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">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Run our sub-menu function as soon as the document is `ready`

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Run our sub-menu function as soon as the document is `ready`.

</ins><span class="cx" style="display: block; padding: 0 10px">          */

</span><span class="cx" style="display: block; padding: 0 10px">        document.addEventListener( 'DOMContentLoaded', function() {

</span><span class="cx" style="display: block; padding: 0 10px">                toggleSubmenuDisplay();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -326,7 +326,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        });

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Run our sub-menu function on selective refresh in the customizer

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Run our sub-menu function on selective refresh in the customizer.

</ins><span class="cx" style="display: block; padding: 0 10px">          */

</span><span class="cx" style="display: block; padding: 0 10px">        document.addEventListener( 'customize-preview-menu-refreshed', function( e, params ) {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( 'menu-1' === params.wpNavMenuArgs.theme_location ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -335,7 +335,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">-         * Run our sub-menu function every time the window resizes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Run our sub-menu function every time the window resizes.

</ins><span class="cx" style="display: block; padding: 0 10px">          */

</span><span class="cx" style="display: block; padding: 0 10px">        var isResizing = false;

</span><span class="cx" style="display: block; padding: 0 10px">        window.addEventListener( 'resize', function() {

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentynineteenpagephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentynineteen/page.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentynineteen/page.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentynineteen/page.php 2020-01-29 00:43:23 UTC (rev 47122)

</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"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        <?php

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        /* Start the Loop */

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Start the Loop.

</ins><span class="cx" style="display: block; padding: 0 10px">                         while ( have_posts() ) :

</span><span class="cx" style="display: block; padding: 0 10px">                                the_post();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,7 +28,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        comments_template();

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        endwhile; // End of the loop.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 endwhile; // End the loop.

</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">                </main><!-- #main -->

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentynineteensearchphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentynineteen/search.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentynineteen/search.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentynineteen/search.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,7 +32,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                /*

<span class="cx" style="display: block; padding: 0 10px">                                 * Include the Post-Format-specific template for the content.

</span><span class="cx" style="display: block; padding: 0 10px">                                 * If you want to override this in a child theme, then include a file

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                 * called content-___.php (where ___ is the Post Format name) and that will be used instead.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                          * called content-___.php (where ___ is the Post Format name) and that

+                                * will be used instead.

</ins><span class="cx" style="display: block; padding: 0 10px">                                  */

</span><span class="cx" style="display: block; padding: 0 10px">                                get_template_part( 'template-parts/content/content', 'excerpt' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentynineteensinglephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentynineteen/single.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentynineteen/single.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentynineteen/single.php       2020-01-29 00:43:23 UTC (rev 47122)

</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"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        <?php

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        /* Start the Loop */

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Start the Loop.

</ins><span class="cx" style="display: block; padding: 0 10px">                         while ( have_posts() ) :

</span><span class="cx" style="display: block; padding: 0 10px">                                the_post();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,7 +50,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        comments_template();

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        endwhile; // End of the loop.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 endwhile; // End the loop.

</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">                </main><!-- #main -->

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentynineteentemplatepartsheaderentryheaderphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentynineteen/template-parts/header/entry-header.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentynineteen/template-parts/header/entry-header.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentynineteen/template-parts/header/entry-header.php   2020-01-29 00:43:23 UTC (rev 47122)

</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">                <?php twentynineteen_comment_count(); ?>

</span><span class="cx" style="display: block; padding: 0 10px">        </span>

</span><span class="cx" style="display: block; padding: 0 10px">        <?php

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Edit post link.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Edit post link.

</ins><span class="cx" style="display: block; padding: 0 10px">                 edit_post_link(

</span><span class="cx" style="display: block; padding: 0 10px">                        sprintf(

</span><span class="cx" style="display: block; padding: 0 10px">                                wp_kses(

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyseventeenarchivephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyseventeen/archive.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyseventeen/archive.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyseventeen/archive.php     2020-01-29 00:43:23 UTC (rev 47122)

</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">                if ( have_posts() ) :

</span><span class="cx" style="display: block; padding: 0 10px">                        ?>

</span><span class="cx" style="display: block; padding: 0 10px">                        <?php

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        /* Start the Loop */

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Start the Loop.

</ins><span class="cx" style="display: block; padding: 0 10px">                         while ( have_posts() ) :

</span><span class="cx" style="display: block; padding: 0 10px">                                the_post();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,7 +37,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                /*

<span class="cx" style="display: block; padding: 0 10px">                                 * Include the Post-Format-specific template for the content.

</span><span class="cx" style="display: block; padding: 0 10px">                                 * If you want to override this in a child theme, then include a file

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                 * called content-___.php (where ___ is the Post Format name) and that will be used instead.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                          * called content-___.php (where ___ is the Post Format name) and that

+                                * will be used instead.

</ins><span class="cx" style="display: block; padding: 0 10px">                                  */

</span><span class="cx" style="display: block; padding: 0 10px">                                get_template_part( 'template-parts/post/content', get_post_format() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyseventeenassetsjscustomizepreviewjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyseventeen/assets/js/customize-preview.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyseventeen/assets/js/customize-preview.js        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyseventeen/assets/js/customize-preview.js  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,7 +9,7 @@

<span class="cx" style="display: block; padding: 0 10px">        // Collect information from customize-controls.js about which panels are opening.

</span><span class="cx" style="display: block; padding: 0 10px">        wp.customize.bind( 'preview-ready', function() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Initially hide the theme option placeholders on load

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Initially hide the theme option placeholders on load.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $( '.panel-placeholder' ).hide();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                wp.customize.preview.bind( 'section-highlight', function( data ) {

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyseventeeninccustomheaderphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyseventeen/inc/custom-header.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyseventeen/inc/custom-header.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyseventeen/inc/custom-header.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,7 +115,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        </style>

</span><span class="cx" style="display: block; padding: 0 10px">                <?php

</span><span class="cx" style="display: block; padding: 0 10px">        }

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-endif; // End of twentyseventeen_header_style.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+endif; // End of twentyseventeen_header_style().

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> /**

<span class="cx" style="display: block; padding: 0 10px">  * Customize video play/pause button in the custom header.

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyseventeeninctemplatetagsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyseventeen/inc/template-tags.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyseventeen/inc/template-tags.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyseventeen/inc/template-tags.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,7 +80,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( ( $categories_list && twentyseventeen_categorized_blog() ) || $tags_list ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        echo '<span class="cat-tags-links">';

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                // Make sure there's more than one category before displaying.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Make sure there's more than one category before displaying.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         if ( $categories_list && twentyseventeen_categorized_blog() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                echo '<span class="cat-links">' . twentyseventeen_get_svg( array( 'icon' => 'folder-open' ) ) . '<span class="screen-reader-text">' . __( 'Categories', 'twentyseventeen' ) . '</span>' . $categories_list . '</span>';

</span><span class="cx" style="display: block; padding: 0 10px">                                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -133,7 +133,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">        if ( is_a( $partial, 'WP_Customize_Partial' ) ) {

<span class="cx" style="display: block; padding: 0 10px">                // Find out the id and set it up during a selective refresh.

</span><span class="cx" style="display: block; padding: 0 10px">                global $twentyseventeencounter;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $id                     = str_replace( 'panel_', '', $partial->id );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

+               $id = str_replace( 'panel_', '', $partial->id );

+

</ins><span class="cx" style="display: block; padding: 0 10px">                 $twentyseventeencounter = $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">@@ -148,8 +150,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                wp_reset_postdata();

</span><span class="cx" style="display: block; padding: 0 10px">        } elseif ( is_customize_preview() ) {

<span class="cx" style="display: block; padding: 0 10px">                // The output placeholder anchor.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                /* translators: %s: The section ID. */

-               echo '<article class="panel-placeholder panel twentyseventeen-panel twentyseventeen-panel' . $id . '" id="panel' . $id . '"><span class="twentyseventeen-panel-title">' . sprintf( __( 'Front Page Section %s Placeholder', 'twentyseventeen' ), $id ) . '</span></article>';

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         printf(

+                       '<article class="panel-placeholder panel twentyseventeen-panel twentyseventeen-panel%1$s" id="panel%1$s">' .

+                       '<span class="twentyseventeen-panel-title">%2$s</span></article>',

+                       $id,

+                       /* translators: %s: The section ID. */

+                       sprintf( __( 'Front Page Section %s Placeholder', 'twentyseventeen' ), $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">@@ -204,7 +211,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Fire the wp_body_open action.

</span><span class="cx" style="display: block; padding: 0 10px">         *

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Added for backwards compatibility to support pre 5.2.0 WordPress versions.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Added for backward compatibility to support pre-5.2.0 WordPress versions.

</ins><span class="cx" style="display: block; padding: 0 10px">          *

</span><span class="cx" style="display: block; padding: 0 10px">         * @since Twenty Seventeen 2.2

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyseventeenindexphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyseventeen/index.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyseventeen/index.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyseventeen/index.php       2020-01-29 00:43:23 UTC (rev 47122)

</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">                        <?php

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( have_posts() ) :

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                /* Start the Loop */

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Start the Loop.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 while ( have_posts() ) :

</span><span class="cx" style="display: block; padding: 0 10px">                                        the_post();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,7 +41,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        /*

<span class="cx" style="display: block; padding: 0 10px">                                         * Include the Post-Format-specific template for the content.

</span><span class="cx" style="display: block; padding: 0 10px">                                         * If you want to override this in a child theme, then include a file

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                         * called content-___.php (where ___ is the Post Format name) and that will be used instead.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                  * called content-___.php (where ___ is the Post Format name) and that

+                                        * will be used instead.

</ins><span class="cx" style="display: block; padding: 0 10px">                                          */

</span><span class="cx" style="display: block; padding: 0 10px">                                        get_template_part( 'template-parts/post/content', get_post_format() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyseventeenpagephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyseventeen/page.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyseventeen/page.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyseventeen/page.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,7 +32,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        comments_template();

</span><span class="cx" style="display: block; padding: 0 10px">                                endif;

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        endwhile; // End of the loop.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 endwhile; // End the loop.

</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">                </main><!-- #main -->

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyseventeensearchphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyseventeen/search.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyseventeen/search.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyseventeen/search.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,7 +32,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                <?php

</span><span class="cx" style="display: block; padding: 0 10px">                if ( have_posts() ) :

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        /* Start the Loop */

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Start the Loop.

</ins><span class="cx" style="display: block; padding: 0 10px">                         while ( have_posts() ) :

</span><span class="cx" style="display: block; padding: 0 10px">                                the_post();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,7 +43,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                 */

</span><span class="cx" style="display: block; padding: 0 10px">                                get_template_part( 'template-parts/post/content', 'excerpt' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        endwhile; // End of the loop.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 endwhile; // End the loop.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        the_posts_pagination(

</span><span class="cx" style="display: block; padding: 0 10px">                                array(

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentyseventeensinglephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyseventeen/single.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyseventeen/single.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyseventeen/single.php      2020-01-29 00:43:23 UTC (rev 47122)

</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">                <main id="main" class="site-main" role="main">

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        <?php

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        /* Start the Loop */

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Start the Loop.

</ins><span class="cx" style="display: block; padding: 0 10px">                         while ( have_posts() ) :

</span><span class="cx" style="display: block; padding: 0 10px">                                the_post();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</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">                                        )

</span><span class="cx" style="display: block; padding: 0 10px">                                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        endwhile; // End of the loop.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 endwhile; // End the loop.

</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">                </main><!-- #main -->

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentysixteenarchivephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentysixteen/archive.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentysixteen/archive.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentysixteen/archive.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,7 +31,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        </header><!-- .page-header -->

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        <?php

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Start the Loop.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Start the loop.

</ins><span class="cx" style="display: block; padding: 0 10px">                         while ( have_posts() ) :

</span><span class="cx" style="display: block; padding: 0 10px">                                the_post();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,7 +38,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                /*

<span class="cx" style="display: block; padding: 0 10px">                                 * Include the Post-Format-specific template for the content.

</span><span class="cx" style="display: block; padding: 0 10px">                                 * If you want to override this in a child theme, then include a file

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                 * called content-___.php (where ___ is the Post Format name) and that will be used instead.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                          * called content-___.php (where ___ is the Post Format name) and that

+                                * will be used instead.

</ins><span class="cx" style="display: block; padding: 0 10px">                                  */

</span><span class="cx" style="display: block; padding: 0 10px">                                get_template_part( 'template-parts/content', get_post_format() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentysixteenfunctionsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentysixteen/functions.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentysixteen/functions.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentysixteen/functions.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -216,7 +216,7 @@

<span class="cx" style="display: block; padding: 0 10px">                // Indicate widget sidebars can use selective refresh in the Customizer.

</span><span class="cx" style="display: block; padding: 0 10px">                add_theme_support( 'customize-selective-refresh-widgets' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-endif; // twentysixteen_setup

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+endif; // twentysixteen_setup()

</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'after_setup_theme', 'twentysixteen_setup' );

</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="trunksrcwpcontentthemestwentysixteenimagephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentysixteen/image.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentysixteen/image.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentysixteen/image.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,7 +13,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                <main id="main" class="site-main" role="main">

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        <?php

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Start the loop.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Start the loop.

</ins><span class="cx" style="display: block; padding: 0 10px">                         while ( have_posts() ) :

</span><span class="cx" style="display: block; padding: 0 10px">                                the_post();

</span><span class="cx" style="display: block; padding: 0 10px">                                ?>

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentysixteeninccustomizerphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentysixteen/inc/customizer.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentysixteen/inc/customizer.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentysixteen/inc/customizer.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -103,7 +103,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                </style>

</span><span class="cx" style="display: block; padding: 0 10px">                <?php

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-endif; // twentysixteen_header_style

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+endif; // twentysixteen_header_style()

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> /**

<span class="cx" style="display: block; padding: 0 10px">  * Adds postMessage support for site title and description for the Customizer.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -385,7 +385,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                return $color_schemes['default']['colors'];

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-endif; // twentysixteen_get_color_scheme

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+endif; // twentysixteen_get_color_scheme()

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! function_exists( 'twentysixteen_get_color_scheme_choices' ) ) :

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -408,7 +408,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                return $color_scheme_control_options;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-endif; // twentysixteen_get_color_scheme_choices

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+endif; // twentysixteen_get_color_scheme_choices()

</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 ( ! function_exists( 'twentysixteen_sanitize_color_scheme' ) ) :

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -432,7 +432,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                return $value;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-endif; // twentysixteen_sanitize_color_scheme

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+endif; // twentysixteen_sanitize_color_scheme()

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> /**

<span class="cx" style="display: block; padding: 0 10px">  * Enqueues front-end CSS for color scheme.

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentysixteeninctemplatetagsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentysixteen/inc/template-tags.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentysixteen/inc/template-tags.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentysixteen/inc/template-tags.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -147,7 +147,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        </a>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                <?php

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        endif; // End is_singular()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ endif; // End is_singular().

</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -228,10 +228,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $all_the_cool_cats > 1 || is_preview() ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // This blog has more than 1 category so twentysixteen_categorized_blog should return true.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // This blog has more than 1 category so twentysixteen_categorized_blog() should return true.

</ins><span class="cx" style="display: block; padding: 0 10px">                         return true;

</span><span class="cx" style="display: block; padding: 0 10px">                } else {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // This blog has only 1 category so twentysixteen_categorized_blog should return false.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // This blog has only 1 category so twentysixteen_categorized_blog() should return false.

</ins><span class="cx" style="display: block; padding: 0 10px">                         return false;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -271,7 +271,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Fire the wp_body_open action.

</span><span class="cx" style="display: block; padding: 0 10px">         *

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Added for backwards compatibility to support pre 5.2.0 WordPress versions.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Added for backward compatibility to support pre-5.2.0 WordPress versions.

</ins><span class="cx" style="display: block; padding: 0 10px">          *

</span><span class="cx" style="display: block; padding: 0 10px">         * @since Twenty Sixteen 2.0

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentysixteenindexphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentysixteen/index.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentysixteen/index.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentysixteen/index.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,7 +35,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                /*

<span class="cx" style="display: block; padding: 0 10px">                                 * Include the Post-Format-specific template for the content.

</span><span class="cx" style="display: block; padding: 0 10px">                                 * If you want to override this in a child theme, then include a file

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                 * called content-___.php (where ___ is the Post Format name) and that will be used instead.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                          * called content-___.php (where ___ is the Post Format name) and that

+                                * will be used instead.

</ins><span class="cx" style="display: block; padding: 0 10px">                                  */

</span><span class="cx" style="display: block; padding: 0 10px">                                get_template_part( 'template-parts/content', get_post_format() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentysixteenpagephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentysixteen/page.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentysixteen/page.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentysixteen/page.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,7 +28,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                comments_template();

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // End of the loop.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // End the loop.

</ins><span class="cx" style="display: block; padding: 0 10px">                 endwhile;

</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="trunksrcwpcontentthemestwentysixteensinglephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentysixteen/single.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentysixteen/single.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentysixteen/single.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -45,7 +45,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // End of the loop.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // End the loop.

</ins><span class="cx" style="display: block; padding: 0 10px">                 endwhile;

</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="trunksrcwpcontentthemestwentyten404php"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyten/404.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyten/404.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyten/404.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,7 +23,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                </div><!-- #content -->

</span><span class="cx" style="display: block; padding: 0 10px">        </div><!-- #container -->

</span><span class="cx" style="display: block; padding: 0 10px">        <script type="text/javascript">

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // focus on search field after it has loaded

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Focus on search field after it has loaded.

</ins><span class="cx" style="display: block; padding: 0 10px">                 document.getElementById('s') && document.getElementById('s').focus();

</span><span class="cx" style="display: block; padding: 0 10px">        </script>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentytenarchivephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyten/archive.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyten/archive.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyten/archive.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,9 +49,9 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> <?php

</span><span class="cx" style="display: block; padding: 0 10px">        /*

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Since we called the_post() above, we need to

-        * rewind the loop back to the beginning that way

-        * we can run the loop properly, in full.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Since we called the_post() above, we need

+        * to rewind the loop back to the beginning.

+        * That way we can run the loop properly, in full.

</ins><span class="cx" style="display: block; padding: 0 10px">          */

</span><span class="cx" style="display: block; padding: 0 10px">        rewind_posts();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentytenauthorphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyten/author.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyten/author.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyten/author.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,9 +65,9 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> <?php

</span><span class="cx" style="display: block; padding: 0 10px">        /*

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Since we called the_post() above, we need to

-        * rewind the loop back to the beginning that way

-        * we can run the loop properly, in full.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Since we called the_post() above, we need

+        * to rewind the loop back to the beginning.

+        * That way we can run the loop properly, in full.

</ins><span class="cx" style="display: block; padding: 0 10px">          */

</span><span class="cx" style="display: block; padding: 0 10px">        rewind_posts();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentytencommentsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyten/comments.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyten/comments.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyten/comments.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,7 +56,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                <div class="nav-previous"><?php previous_comments_link( __( '<span class="meta-nav">&larr;</span> Older Comments', 'twentyten' ) ); ?></div>

</span><span class="cx" style="display: block; padding: 0 10px">                                <div class="nav-next"><?php next_comments_link( __( 'Newer Comments <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?></div>

</span><span class="cx" style="display: block; padding: 0 10px">                        </div> <!-- .navigation -->

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        <?php endif; // check for comment navigation ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php endif; // Check for comment navigation. ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        <ol class="commentlist">

</span><span class="cx" style="display: block; padding: 0 10px">                                <?php

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,7 +76,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                <div class="nav-previous"><?php previous_comments_link( __( '<span class="meta-nav">&larr;</span> Older Comments', 'twentyten' ) ); ?></div>

</span><span class="cx" style="display: block; padding: 0 10px">                                <div class="nav-next"><?php next_comments_link( __( 'Newer Comments <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?></div>

</span><span class="cx" style="display: block; padding: 0 10px">                        </div><!-- .navigation -->

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        <?php endif; // check for comment navigation ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php endif; // Check for comment navigation. ?>

</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">        /*

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -88,7 +88,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                <p class="nocomments"><?php _e( 'Comments are closed.', 'twentyten' ); ?></p>

</span><span class="cx" style="display: block; padding: 0 10px">        <?php endif; ?>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php endif; // end have_comments() ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php endif; // End have_comments(). ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> <?php comment_form(); ?>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentytenfunctionsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyten/functions.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyten/functions.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyten/functions.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,7 +27,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">  * <code>

</span><span class="cx" style="display: block; padding: 0 10px">  * add_action( 'after_setup_theme', 'my_child_theme_setup' );

</span><span class="cx" style="display: block; padding: 0 10px">  * function my_child_theme_setup() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *     // We are providing our own filter for excerpt_length (or using the unfiltered value)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *     // We are providing our own filter for excerpt_length (or using the unfiltered value).

</ins><span class="cx" style="display: block; padding: 0 10px">  *     remove_filter( 'excerpt_length', 'twentyten_excerpt_length' );

</span><span class="cx" style="display: block; padding: 0 10px">  *     ...

</span><span class="cx" style="display: block; padding: 0 10px">  * }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -119,15 +119,15 @@

<span class="cx" style="display: block; padding: 0 10px">                // Post Format support. You can also use the legacy "gallery" or "asides" (note the plural) categories.

</span><span class="cx" style="display: block; padding: 0 10px">                add_theme_support( 'post-formats', array( 'aside', 'gallery' ) );

</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 theme uses post thumbnails

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // This theme uses post thumbnails.

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_theme_support( 'post-thumbnails' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Add default posts and comments RSS feed links to head

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Add default posts and comments RSS feed links to head.

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_theme_support( 'automatic-feed-links' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                /*

<span class="cx" style="display: block; padding: 0 10px">                 * Make theme available for translation.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 * Translations can be filed in the /languages/ directory

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+          * Translations can be filed in the /languages/ directory.

</ins><span class="cx" style="display: block; padding: 0 10px">                  */

</span><span class="cx" style="display: block; padding: 0 10px">                load_theme_textdomain( 'twentyten', get_template_directory() . '/languages' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -200,7 +200,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                set_post_thumbnail_size( $custom_header_support['width'], $custom_header_support['height'], true );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // ... and thus ends the custom header business.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // ...and thus ends the custom header business.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Default custom headers packaged with the theme. %s is a placeholder for the theme template directory URI.

</span><span class="cx" style="display: block; padding: 0 10px">                register_default_headers(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -394,7 +394,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> function twentyten_remove_gallery_css( $css ) {

</span><span class="cx" style="display: block; padding: 0 10px">        return preg_replace( "#<style type='text/css'>(.*?)</style>#s", '', $css );

</span><span class="cx" style="display: block; padding: 0 10px"> }

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Backwards compatibility with WordPress 3.0.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Backward compatibility with WordPress 3.0.

</ins><span class="cx" style="display: block; padding: 0 10px"> if ( version_compare( $GLOBALS['wp_version'], '3.1', '<' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">        add_filter( 'gallery_style', 'twentyten_remove_gallery_css' );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -740,7 +740,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Fire the wp_body_open action.

</span><span class="cx" style="display: block; padding: 0 10px">         *

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Added for backwards compatibility to support pre 5.2.0 WordPress versions.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Added for backward compatibility to support pre-5.2.0 WordPress versions.

</ins><span class="cx" style="display: block; padding: 0 10px">          *

</span><span class="cx" style="display: block; padding: 0 10px">         * @since Twenty Ten 2.9

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentytenheaderphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyten/header.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyten/header.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyten/header.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -86,7 +86,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        $header_image_width = HEADER_IMAGE_WIDTH;

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Check if this is a post or page, if it has a thumbnail, and if it's a big one

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Check if this is a post or page, if it has a thumbnail, and if it's a big one.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( is_singular() && has_post_thumbnail( $post->ID ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        $image = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), array( $header_image_width, $header_image_width ) );

</span><span class="cx" style="display: block; padding: 0 10px">                                        if ( $image && $image[1] >= $header_image_width ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -105,15 +105,19 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        ?>

</span><span class="cx" style="display: block; padding: 0 10px">                                        <img src="<?php header_image(); ?>" width="<?php echo esc_attr( $header_image_width ); ?>" height="<?php echo esc_attr( $header_image_height ); ?>" alt="" />

</span><span class="cx" style="display: block; padding: 0 10px">                                        <?php

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                } // end check for featured image or standard header

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         } // End check for featured image or standard header.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 ?>

</span><span class="cx" style="display: block; padding: 0 10px">                        </div><!-- #branding -->

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        <div id="access" role="navigation">

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <?php /* Allow screen readers / text browsers to skip the navigation menu and get right to the good stuff */ ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <?php // Allow screen readers / text browsers to skip the navigation menu and get right to the good stuff. ?>

</ins><span class="cx" style="display: block; padding: 0 10px">                                 <div class="skip-link screen-reader-text"><a href="#content" title="<?php esc_attr_e( 'Skip to content', 'twentyten' ); ?>"><?php _e( 'Skip to content', 'twentyten' ); ?></a></div>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <?php /* Our navigation menu. If one isn't filled out, wp_nav_menu falls back to wp_page_menu. The menu assiged to the primary position is the one used. If none is assigned, the menu with the lowest ID is used. */ ?>

</del><span class="cx" style="display: block; padding: 0 10px">                                 <?php

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                /*

+                                * Our navigation menu. If one isn't filled out, wp_nav_menu() falls back to wp_page_menu().

+                                * The menu assigned to the primary location is the one used.

+                                * If one isn't assigned, the menu with the lowest ID is used.

+                                */

</ins><span class="cx" style="display: block; padding: 0 10px">                                 wp_nav_menu(

</span><span class="cx" style="display: block; padding: 0 10px">                                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                                'container_class' => 'menu-header',

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentytenloopattachmentphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyten/loop-attachment.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyten/loop-attachment.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyten/loop-attachment.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -105,40 +105,42 @@

</span><span class="cx" style="display: 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 there is more than 1 image attachment in a gallery

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // If there is more than 1 image attachment in a gallery...

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( count( $attachments ) > 1 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $k++;

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( isset( $attachments[ $k ] ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // get the URL of the next image attachment

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // ...get the URL of the next image attachment.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         $next_attachment_url = get_attachment_link( $attachments[ $k ]->ID );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                } else {          // or get the URL of the first image attachment

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         } else {

+                                       // ...or get the URL of the first image attachment.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         $next_attachment_url = get_attachment_link( $attachments[0]->ID );

</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">-                                // or, if there's only 1 image attachment, get the URL of the image

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Or, if there's only 1 image attachment, get the URL of the image.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $next_attachment_url = wp_get_attachment_url();

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                        ?>

</span><span class="cx" style="display: block; padding: 0 10px">                                                <p class="attachment"><a href="<?php echo esc_url( $next_attachment_url ); ?>" title="<?php the_title_attribute(); ?>" rel="attachment">

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                                                                                                        <?php

-                                                                                                                                       /**

-                                                                                                                                        * Filter the Twenty Ten default attachment width.

-                                                                                                                                        *

-                                                                                                                                        * @since Twenty Ten 1.0

-                                                                                                                                        *

-                                                                                                                                        * @param int The default attachment width in pixels. Default 900.

-                                                                                                                                        */

-                                                                                                                                       $attachment_width = apply_filters( 'twentyten_attachment_size', 900 );

-                                                                                                                                       /**

-                                                                                                                                        * Filter the Twenty Ten default attachment height.

-                                                                                                                                        *

-                                                                                                                                        * @since Twenty Ten 1.0

-                                                                                                                                        *

-                                                                                                                                        * @param int The default attachment height in pixels. Default 900.

-                                                                                                                                        */

-                                                                                                                                       $attachment_height = apply_filters( 'twentyten_attachment_height', 900 );

-                                                                                                                                       echo wp_get_attachment_image( $post->ID, array( $attachment_width, $attachment_height ) ); // filterable image width with, essentially, no limit for image height.

-                                                                                                                                       ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 <?php

+                                                       /**

+                                                        * Filter the Twenty Ten default attachment width.

+                                                        *

+                                                        * @since Twenty Ten 1.0

+                                                        *

+                                                        * @param int The default attachment width in pixels. Default 900.

+                                                        */

+                                                       $attachment_width = apply_filters( 'twentyten_attachment_size', 900 );

+                                                       /**

+                                                        * Filter the Twenty Ten default attachment height.

+                                                        *

+                                                        * @since Twenty Ten 1.0

+                                                        *

+                                                        * @param int The default attachment height in pixels. Default 900.

+                                                        */

+                                                       $attachment_height = apply_filters( 'twentyten_attachment_height', 900 );

+                                                       // Filterable image width with, essentially, no limit for image height.

+                                                       echo wp_get_attachment_image( $post->ID, array( $attachment_width, $attachment_height ) );

+                                                       ?>

</ins><span class="cx" style="display: block; padding: 0 10px">                                                         </a></p>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                                        <div id="nav-below" class="navigation">

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -177,4 +179,4 @@

</span><span class="cx" style="display: block; padding: 0 10px">                <?php comments_template(); ?>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> <?php endwhile;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-}; // end of the loop. ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+}; // End of the loop. ?>

</ins></span></pre></div>

<a id="trunksrcwpcontentthemestwentytenlooppagephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyten/loop-page.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyten/loop-page.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyten/loop-page.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -45,4 +45,4 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                <?php comments_template( '', true ); ?>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> <?php endwhile;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-}; // end of the loop. ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+}; // End of the loop. ?>

</ins></span></pre></div>

<a id="trunksrcwpcontentthemestwentytenloopsinglephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyten/loop-single.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyten/loop-single.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyten/loop-single.php       2020-01-29 00:43:23 UTC (rev 47122)

</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">                                        </div><!-- .entry-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">-                <?php if ( get_the_author_meta( 'description' ) ) : // If a user has filled out their description, show a bio on their entries ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <?php if ( get_the_author_meta( 'description' ) ) : // If a user has filled out their description, show a bio on their entries. ?>

</ins><span class="cx" style="display: block; padding: 0 10px">                                         <div id="entry-author-info">

</span><span class="cx" style="display: block; padding: 0 10px">                                                <div id="author-avatar">

</span><span class="cx" style="display: block; padding: 0 10px">                                                        <?php

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -88,4 +88,4 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        <?php comments_template( '', true ); ?>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        <?php endwhile;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-}; // end of the loop. ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+}; // End of the loop. ?>

</ins></span></pre></div>

<a id="trunksrcwpcontentthemestwentytenloopphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyten/loop.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyten/loop.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyten/loop.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,7 +19,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> ?>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php /* Display navigation to next/previous pages when applicable */ ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php // Display navigation to next/previous pages when applicable. ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $wp_query->max_num_pages > 1 ) : ?>

</span><span class="cx" style="display: block; padding: 0 10px">        <div id="nav-above" class="navigation">

</span><span class="cx" style="display: block; padding: 0 10px">                <div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' ) ); ?></div>

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,7 +94,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                                );

</span><span class="cx" style="display: block; padding: 0 10px">                                        ?>

</span><span class="cx" style="display: block; padding: 0 10px">                                                        </em></p>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <?php endif; // end twentyten_get_gallery_images() check ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <?php endif; // End twentyten_get_gallery_images() check. ?>

</ins><span class="cx" style="display: block; padding: 0 10px">                                                 <?php the_excerpt(); ?>

</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>

</span><span class="cx" style="display: block; padding: 0 10px">                        </div><!-- .entry-content -->

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -197,9 +197,9 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        <?php endif; // This was the if statement that broke the loop into three parts based on categories. ?>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php endwhile; // End the loop. Whew. ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php endwhile; // End of the loop. Whew. ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php /* Display navigation to next/previous pages when applicable */ ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php // Display navigation to next/previous pages when applicable. ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $wp_query->max_num_pages > 1 ) : ?>

</span><span class="cx" style="display: block; padding: 0 10px">                                <div id="nav-below" class="navigation">

</span><span class="cx" style="display: block; padding: 0 10px">                                        <div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' ) ); ?></div>

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentytensidebarphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyten/sidebar.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyten/sidebar.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyten/sidebar.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,7 +41,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                </ul>

</span><span class="cx" style="display: block; padding: 0 10px">                        </li>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <?php endif; // end primary widget area ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <?php endif; // End primary widget area. ?>

</ins><span class="cx" style="display: block; padding: 0 10px">                         </ul>

</span><span class="cx" style="display: block; padding: 0 10px">                </div><!-- #primary .widget-area -->

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentytentagphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyten/tag.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyten/tag.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentyten/tag.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,14 +19,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                ?>

</span><span class="cx" style="display: block; padding: 0 10px">                                </h1>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php

-/*

- * Run the loop for the tag archive to output the posts

- * If you want to overload this in a child theme then include a file

- * called loop-tag.php and that will be used instead.

- */

-get_template_part( 'loop', 'tag' );

-?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <?php

+                               /*

+                                * Run the loop for the tag archive to output the posts

+                                * If you want to overload this in a child theme then include a file

+                                * called loop-tag.php and that will be used instead.

+                                */

+                               get_template_part( 'loop', 'tag' );

+                               ?>

</ins><span class="cx" style="display: block; padding: 0 10px">                         </div><!-- #content -->

</span><span class="cx" style="display: block; padding: 0 10px">                </div><!-- #container -->

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentythirteenarchivephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentythirteen/archive.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentythirteen/archive.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentythirteen/archive.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,8 +42,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                </h1>

</span><span class="cx" style="display: block; padding: 0 10px">                        </header><!-- .archive-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">-                        <?php /* The loop */ ?>

</del><span class="cx" style="display: block; padding: 0 10px">                         <?php

<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        // Start the loop.

</ins><span class="cx" style="display: block; padding: 0 10px">                         while ( have_posts() ) :

</span><span class="cx" style="display: block; padding: 0 10px">                                the_post();

</span><span class="cx" style="display: block; padding: 0 10px">                                ?>

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentythirteenauthorphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentythirteen/author.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentythirteen/author.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentythirteen/author.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,9 +38,9 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        <?php

</span><span class="cx" style="display: block; padding: 0 10px">                                /*

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                 * Since we called the_post() above, we need to

-                                * rewind the loop back to the beginning that way

-                                * we can run the loop properly, in full.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                          * Since we called the_post() above, we need

+                                * to rewind the loop back to the beginning.

+                                * That way we can run the loop properly, in full.

</ins><span class="cx" style="display: block; padding: 0 10px">                                  */

</span><span class="cx" style="display: block; padding: 0 10px">                                rewind_posts();

</span><span class="cx" style="display: block; padding: 0 10px">                        ?>

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,8 +49,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                <?php get_template_part( 'author-bio' ); ?>

</span><span class="cx" style="display: block; padding: 0 10px">                        <?php endif; ?>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <?php /* The loop */ ?>

</del><span class="cx" style="display: block; padding: 0 10px">                         <?php

<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        // Start the loop.

</ins><span class="cx" style="display: block; padding: 0 10px">                         while ( have_posts() ) :

</span><span class="cx" style="display: block; padding: 0 10px">                                the_post();

</span><span class="cx" style="display: block; padding: 0 10px">                                ?>

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentythirteencategoryphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentythirteen/category.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentythirteen/category.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentythirteen/category.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,13 +23,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                ?>

</span><span class="cx" style="display: block; padding: 0 10px">                                </h1>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <?php if ( category_description() ) : // Show an optional category description ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <?php if ( category_description() ) : // Show an optional category description. ?>

</ins><span class="cx" style="display: block; padding: 0 10px">                                 <div class="archive-meta"><?php echo category_description(); ?></div>

</span><span class="cx" style="display: block; padding: 0 10px">                                <?php endif; ?>

</span><span class="cx" style="display: block; padding: 0 10px">                        </header><!-- .archive-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">-                        <?php /* The loop */ ?>

</del><span class="cx" style="display: block; padding: 0 10px">                         <?php

<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        // Start the loop.

</ins><span class="cx" style="display: block; padding: 0 10px">                         while ( have_posts() ) :

</span><span class="cx" style="display: block; padding: 0 10px">                                the_post();

</span><span class="cx" style="display: block; padding: 0 10px">                                ?>

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentythirteencommentsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentythirteen/comments.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentythirteen/comments.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentythirteen/comments.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -61,7 +61,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                <div class="nav-previous"><?php previous_comments_link( __( '&larr; Older Comments', 'twentythirteen' ) ); ?></div>

</span><span class="cx" style="display: block; padding: 0 10px">                <div class="nav-next"><?php next_comments_link( __( 'Newer Comments &rarr;', 'twentythirteen' ) ); ?></div>

</span><span class="cx" style="display: block; padding: 0 10px">                </nav><!-- .comment-navigation -->

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <?php endif; // Check for comment navigation ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <?php endif; // Check for comment navigation. ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                <?php if ( ! comments_open() && get_comments_number() ) : ?>

</span><span class="cx" style="display: block; padding: 0 10px">                <p class="no-comments"><?php _e( 'Comments are closed.', 'twentythirteen' ); ?></p>

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentythirteencontentphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentythirteen/content.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentythirteen/content.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentythirteen/content.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,7 +32,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                </div><!-- .entry-meta -->

</span><span class="cx" style="display: block; padding: 0 10px">        </header><!-- .entry-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">-        <?php if ( is_search() ) : // Only display Excerpts for Search ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( is_search() ) : // Only display excerpts for search. ?>

</ins><span class="cx" style="display: block; padding: 0 10px">         <div class="entry-summary">

</span><span class="cx" style="display: block; padding: 0 10px">                <?php the_excerpt(); ?>

</span><span class="cx" style="display: block; padding: 0 10px">        </div><!-- .entry-summary -->

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentythirteenfunctionsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentythirteen/functions.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentythirteen/functions.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentythirteen/functions.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -494,7 +494,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        echo '<span class="tags-links">' . $tag_list . '</span>';

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Post author

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Post author.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( 'post' == get_post_type() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        printf(

</span><span class="cx" style="display: block; padding: 0 10px">                                '<span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s" rel="author">%3$s</a></span>',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -592,11 +592,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // get the URL of the next image attachment...

</del><span class="cx" style="display: block; padding: 0 10px">                         if ( $next_id ) {

<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                // ...get the URL of the next image attachment.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $next_attachment_url = get_attachment_link( $next_id );

</span><span class="cx" style="display: block; padding: 0 10px">                        } else {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // or get the URL of the first image attachment.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // ...or get the URL of the first image attachment.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $next_attachment_url = get_attachment_link( reset( $attachment_ids ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -812,7 +812,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Fire the wp_body_open action.

</span><span class="cx" style="display: block; padding: 0 10px">         *

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Added for backwards compatibility to support pre 5.2.0 WordPress versions.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Added for backward compatibility to support pre-5.2.0 WordPress versions.

</ins><span class="cx" style="display: block; padding: 0 10px">          *

</span><span class="cx" style="display: block; padding: 0 10px">         * @since Twenty Thirteen 2.8

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentythirteenimagephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentythirteen/image.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentythirteen/image.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentythirteen/image.php        2020-01-29 00:43:23 UTC (rev 47122)

</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">                <div id="content" class="site-content" role="main">

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        <?php

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Start the Loop.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Start the loop.

</ins><span class="cx" style="display: block; padding: 0 10px">                         while ( have_posts() ) :

</span><span class="cx" style="display: block; padding: 0 10px">                                the_post();

</span><span class="cx" style="display: block; padding: 0 10px">                                ?>

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,7 +94,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                <?php comments_template(); ?>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <?php endwhile; // End the loop. ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <?php endwhile; // End of the loop. ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                </div><!-- #content -->

</span><span class="cx" style="display: block; padding: 0 10px">        </div><!-- #primary -->

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentythirteenindexphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentythirteen/index.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentythirteen/index.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentythirteen/index.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,8 +20,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                <div id="content" class="site-content" role="main">

</span><span class="cx" style="display: block; padding: 0 10px">                <?php if ( have_posts() ) : ?>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <?php /* The loop */ ?>

</del><span class="cx" style="display: block; padding: 0 10px">                         <?php

<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        // Start the loop.

</ins><span class="cx" style="display: block; padding: 0 10px">                         while ( have_posts() ) :

</span><span class="cx" style="display: block; padding: 0 10px">                                the_post();

</span><span class="cx" style="display: block; padding: 0 10px">                                ?>

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentythirteenpagephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentythirteen/page.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentythirteen/page.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentythirteen/page.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,8 +16,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">        <div id="primary" class="content-area">

</span><span class="cx" style="display: block; padding: 0 10px">                <div id="content" class="site-content" role="main">

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <?php /* The loop */ ?>

</del><span class="cx" style="display: block; padding: 0 10px">                         <?php

<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        // Start the loop.

</ins><span class="cx" style="display: block; padding: 0 10px">                         while ( have_posts() ) :

</span><span class="cx" style="display: block; padding: 0 10px">                                the_post();

</span><span class="cx" style="display: block; padding: 0 10px">                                ?>

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentythirteensearchphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentythirteen/search.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentythirteen/search.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentythirteen/search.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,8 +23,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                </h1>

</span><span class="cx" style="display: block; padding: 0 10px">                        </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">-                        <?php /* The loop */ ?>

</del><span class="cx" style="display: block; padding: 0 10px">                         <?php

<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        // Start the loop.

</ins><span class="cx" style="display: block; padding: 0 10px">                         while ( have_posts() ) :

</span><span class="cx" style="display: block; padding: 0 10px">                                the_post();

</span><span class="cx" style="display: block; padding: 0 10px">                                ?>

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentythirteensinglephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentythirteen/single.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentythirteen/single.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentythirteen/single.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,8 +12,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">        <div id="primary" class="content-area">

</span><span class="cx" style="display: block; padding: 0 10px">                <div id="content" class="site-content" role="main">

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <?php /* The loop */ ?>

</del><span class="cx" style="display: block; padding: 0 10px">                         <?php

<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        // Start the loop.

</ins><span class="cx" style="display: block; padding: 0 10px">                         while ( have_posts() ) :

</span><span class="cx" style="display: block; padding: 0 10px">                                the_post();

</span><span class="cx" style="display: block; padding: 0 10px">                                ?>

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentythirteentagphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentythirteen/tag.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentythirteen/tag.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentythirteen/tag.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,13 +25,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                ?>

</span><span class="cx" style="display: block; padding: 0 10px">                                </h1>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <?php if ( tag_description() ) : // Show an optional tag description ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <?php if ( tag_description() ) : // Show an optional tag description. ?>

</ins><span class="cx" style="display: block; padding: 0 10px">                                 <div class="archive-meta"><?php echo tag_description(); ?></div>

</span><span class="cx" style="display: block; padding: 0 10px">                                <?php endif; ?>

</span><span class="cx" style="display: block; padding: 0 10px">                        </header><!-- .archive-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">-                        <?php /* The loop */ ?>

</del><span class="cx" style="display: block; padding: 0 10px">                         <?php

<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        // Start the loop.

</ins><span class="cx" style="display: block; padding: 0 10px">                         while ( have_posts() ) :

</span><span class="cx" style="display: block; padding: 0 10px">                                the_post();

</span><span class="cx" style="display: block; padding: 0 10px">                                ?>

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentythirteentaxonomypost_formatphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentythirteen/taxonomy-post_format.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentythirteen/taxonomy-post_format.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentythirteen/taxonomy-post_format.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,8 +28,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                </h1>

</span><span class="cx" style="display: block; padding: 0 10px">                        </header><!-- .archive-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">-                        <?php /* The loop */ ?>

</del><span class="cx" style="display: block; padding: 0 10px">                         <?php

<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        // Start the loop.

</ins><span class="cx" style="display: block; padding: 0 10px">                         while ( have_posts() ) :

</span><span class="cx" style="display: block; padding: 0 10px">                                the_post();

</span><span class="cx" style="display: block; padding: 0 10px">                                ?>

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentytwelvearchivephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwelve/archive.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwelve/archive.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentytwelve/archive.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,12 +43,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        </header><!-- .archive-header -->

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        <?php

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        /* Start the Loop */

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Start the Loop.

</ins><span class="cx" style="display: block; padding: 0 10px">                         while ( have_posts() ) :

</span><span class="cx" style="display: block; padding: 0 10px">                                the_post();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                /* Include the post format-specific template for the content. If you want to

-                                * this in a child theme then include a file called content-___.php

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         /*

+                                * Include the post format-specific template for the content. If you want

+                                * to use this in a child theme then include a file called content-___.php

</ins><span class="cx" style="display: block; padding: 0 10px">                                  * (where ___ is the post format) and that will be used instead.

</span><span class="cx" style="display: block; padding: 0 10px">                                 */

</span><span class="cx" style="display: block; padding: 0 10px">                                get_template_part( 'content', get_post_format() );

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentytwelveauthorphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwelve/author.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwelve/author.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentytwelve/author.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,7 +19,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                <?php if ( have_posts() ) : ?>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        <?php

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                /* Queue the first post, that way we know

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         /*

+                                * Queue the first post, that way we know

</ins><span class="cx" style="display: block; padding: 0 10px">                                  * what author we're dealing with (if that is the case).

</span><span class="cx" style="display: block; padding: 0 10px">                                 *

</span><span class="cx" style="display: block; padding: 0 10px">                                 * We reset this later so we can run the loop

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,9 +39,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        </header><!-- .archive-header -->

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        <?php

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                /* Since we called the_post() above, we need to

-                                * rewind the loop back to the beginning that way

-                                * we can run the loop properly, in full.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         /*

+                                * Since we called the_post() above, we need

+                                * to rewind the loop back to the beginning.

+                                * That way we can run the loop properly, in full.

</ins><span class="cx" style="display: block; padding: 0 10px">                                  */

</span><span class="cx" style="display: block; padding: 0 10px">                                rewind_posts();

</span><span class="cx" style="display: block; padding: 0 10px">                        ?>

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,8 +79,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        </div><!-- .author-info -->

</span><span class="cx" style="display: block; padding: 0 10px">                        <?php endif; ?>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <?php /* Start the Loop */ ?>

</del><span class="cx" style="display: block; padding: 0 10px">                         <?php

<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        // Start the Loop.

</ins><span class="cx" style="display: block; padding: 0 10px">                         while ( have_posts() ) :

</span><span class="cx" style="display: block; padding: 0 10px">                                the_post();

</span><span class="cx" style="display: block; padding: 0 10px">                                ?>

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentytwelvecategoryphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwelve/category.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwelve/category.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentytwelve/category.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,18 +25,19 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                ?>

</span><span class="cx" style="display: block; padding: 0 10px">                                </h1>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <?php if ( category_description() ) : // Show an optional category description ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <?php if ( category_description() ) : // Show an optional category description. ?>

</ins><span class="cx" style="display: block; padding: 0 10px">                                 <div class="archive-meta"><?php echo category_description(); ?></div>

</span><span class="cx" style="display: block; padding: 0 10px">                        <?php endif; ?>

</span><span class="cx" style="display: block; padding: 0 10px">                        </header><!-- .archive-header -->

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        <?php

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        /* Start the Loop */

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Start the Loop.

</ins><span class="cx" style="display: block; padding: 0 10px">                         while ( have_posts() ) :

</span><span class="cx" style="display: block; padding: 0 10px">                                the_post();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                /* Include the post format-specific template for the content. If you want to

-                                * this in a child theme then include a file called content-___.php

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         /*

+                                * Include the post format-specific template for the content. If you want

+                                * to use this in a child theme then include a file called content-___.php

</ins><span class="cx" style="display: block; padding: 0 10px">                                  * (where ___ is the post format) and that will be used instead.

</span><span class="cx" style="display: block; padding: 0 10px">                                 */

</span><span class="cx" style="display: block; padding: 0 10px">                                get_template_part( 'content', get_post_format() );

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentytwelvecommentsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwelve/comments.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwelve/comments.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentytwelve/comments.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,16 +57,17 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        ?>

</span><span class="cx" style="display: block; padding: 0 10px">                </ol><!-- .commentlist -->

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // Are there comments to navigate through? ?>

</ins><span class="cx" style="display: block; padding: 0 10px">                 <nav id="comment-nav-below" class="navigation" role="navigation">

</span><span class="cx" style="display: block; padding: 0 10px">                        <h1 class="assistive-text section-heading"><?php _e( 'Comment navigation', 'twentytwelve' ); ?></h1>

</span><span class="cx" style="display: block; padding: 0 10px">                        <div class="nav-previous"><?php previous_comments_link( __( '&larr; Older Comments', 'twentytwelve' ) ); ?></div>

</span><span class="cx" style="display: block; padding: 0 10px">                        <div class="nav-next"><?php next_comments_link( __( 'Newer Comments &rarr;', 'twentytwelve' ) ); ?></div>

</span><span class="cx" style="display: block; padding: 0 10px">                </nav>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <?php endif; // check for comment navigation ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <?php endif; // Check for comment navigation. ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                <?php

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                /* If there are no comments and comments are closed, let's leave a note.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /*

+                * If there are no comments and comments are closed, let's leave a note.

</ins><span class="cx" style="display: block; padding: 0 10px">                  * But we only want the note on posts and pages that had comments in the first place.

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! comments_open() && get_comments_number() ) :

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentytwelvecontentphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwelve/content.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwelve/content.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentytwelve/content.php        2020-01-29 00:43:23 UTC (rev 47122)

</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">                        <?php endif; // comments_open() ?>

</span><span class="cx" style="display: block; padding: 0 10px">                </header><!-- .entry-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">-                <?php if ( is_search() ) : // Only display Excerpts for Search ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <?php if ( is_search() ) : // Only display excerpts for search. ?>

</ins><span class="cx" style="display: block; padding: 0 10px">                 <div class="entry-summary">

</span><span class="cx" style="display: block; padding: 0 10px">                        <?php the_excerpt(); ?>

</span><span class="cx" style="display: block; padding: 0 10px">                </div><!-- .entry-summary -->

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -58,7 +58,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                <footer class="entry-meta">

</span><span class="cx" style="display: block; padding: 0 10px">                        <?php twentytwelve_entry_meta(); ?>

</span><span class="cx" style="display: block; padding: 0 10px">                        <?php edit_post_link( __( 'Edit', 'twentytwelve' ), '<span class="edit-link">', '</span>' ); ?>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <?php if ( is_singular() && get_the_author_meta( 'description' ) && is_multi_author() ) : // If a user has filled out their description and this is a multi-author blog, show a bio on their entries. ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <?php

+                       // If a user has filled out their description and this is a multi-author blog, show a bio on their entries.

+                       if ( is_singular() && get_the_author_meta( 'description' ) && is_multi_author() ) :

+                               ?>

</ins><span class="cx" style="display: block; padding: 0 10px">                                 <div class="author-info">

</span><span class="cx" style="display: block; padding: 0 10px">                                        <div class="author-avatar">

</span><span class="cx" style="display: block; padding: 0 10px">                                                <?php

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,10 +80,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                                <p><?php the_author_meta( 'description' ); ?></p>

</span><span class="cx" style="display: block; padding: 0 10px">                                                <div class="author-link">

</span><span class="cx" style="display: block; padding: 0 10px">                                                        <a href="<?php echo esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ); ?>" rel="author">

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                                <?php

-                                                               /* translators: %s: Author display name. */

-                                                               printf( __( 'View all posts by %s <span class="meta-nav">&rarr;</span>', 'twentytwelve' ), get_the_author() );

-                                                               ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 <?php

+                                                       /* translators: %s: Author display name. */

+                                                       printf( __( 'View all posts by %s <span class="meta-nav">&rarr;</span>', 'twentytwelve' ), get_the_author() );

+                                                       ?>

</ins><span class="cx" style="display: block; padding: 0 10px">                                                         </a>

</span><span class="cx" style="display: block; padding: 0 10px">                                                </div><!-- .author-link        -->

</span><span class="cx" style="display: block; padding: 0 10px">                                        </div><!-- .author-description -->

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentytwelvefunctionsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwelve/functions.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwelve/functions.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentytwelve/functions.php      2020-01-29 00:43:23 UTC (rev 47122)

</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"> 

<span class="cx" style="display: block; padding: 0 10px">        // This theme uses a custom image size for featured images, displayed on "standard" posts.

</span><span class="cx" style="display: block; padding: 0 10px">        add_theme_support( 'post-thumbnails' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        set_post_thumbnail_size( 624, 9999 ); // Unlimited height, soft crop

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ set_post_thumbnail_size( 624, 9999 ); // Unlimited height, soft crop.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">        // Indicate widget sidebars can use selective refresh in the Customizer.

</span><span class="cx" style="display: block; padding: 0 10px">        add_theme_support( 'customize-selective-refresh-widgets' );

</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">                        </article><!-- #comment-## -->

</span><span class="cx" style="display: block; padding: 0 10px">                                <?php

</span><span class="cx" style="display: block; padding: 0 10px">                                break;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                endswitch; // end comment_type check

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         endswitch; // End comment_type check.

</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -706,7 +706,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Fire the wp_body_open action.

</span><span class="cx" style="display: block; padding: 0 10px">         *

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Added for backwards compatibility to support pre 5.2.0 WordPress versions.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Added for backward compatibility to support pre-5.2.0 WordPress versions.

</ins><span class="cx" style="display: block; padding: 0 10px">          *

</span><span class="cx" style="display: block; padding: 0 10px">         * @since Twenty Twelve 3.0

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentytwelveimagephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwelve/image.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwelve/image.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentytwelve/image.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,38 +73,38 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( $attachment->ID == $post->ID ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        break;

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-endforeach;

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 endforeach;

</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 there is more than 1 attachment in a gallery

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // If there is more than 1 attachment in a gallery...

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( count( $attachments ) > 1 ) :

</span><span class="cx" style="display: block; padding: 0 10px">                                $k++;

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( isset( $attachments[ $k ] ) ) :

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // get the URL of the next image attachment

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // ...get the URL of the next image attachment.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         $next_attachment_url = get_attachment_link( $attachments[ $k ]->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">-                                        // or get the URL of the first image attachment

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // ...or get the URL of the first image attachment.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         $next_attachment_url = get_attachment_link( $attachments[0]->ID );

</span><span class="cx" style="display: block; padding: 0 10px">                                endif;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-else :

-       // or, if there's only 1 image, get the URL of the image

-       $next_attachment_url = wp_get_attachment_url();

-endif;

-?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 else :

+                               // Or, if there's only 1 image, get the URL of the image.

+                               $next_attachment_url = wp_get_attachment_url();

+                       endif;

+                       ?>

</ins><span class="cx" style="display: block; padding: 0 10px">                                                                 <a href="<?php echo esc_url( $next_attachment_url ); ?>" title="<?php the_title_attribute(); ?>" rel="attachment">

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                                                                        <?php

-                                                                                                       /**

-                                                                                                        * Filter the image attachment size to use.

-                                                                                                        *

-                                                                                                        * @since Twenty Twelve 1.0

-                                                                                                        *

-                                                                                                        * @param array $size {

-                                                                                                        *     @type int The attachment height in pixels.

-                                                                                                        *     @type int The attachment width in pixels.

-                                                                                                        * }

-                                                                                                        */

-                                                                                                       $attachment_size = apply_filters( 'twentytwelve_attachment_size', array( 960, 960 ) );

-                                                                                                       echo wp_get_attachment_image( $post->ID, $attachment_size );

-                                                                                                       ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                                 <?php

+                                                                       /**

+                                                                        * Filter the image attachment size to use.

+                                                                        *

+                                                                        * @since Twenty Twelve 1.0

+                                                                        *

+                                                                        * @param array $size {

+                                                                        *     @type int The attachment height in pixels.

+                                                                        *     @type int The attachment width in pixels.

+                                                                        * }

+                                                                        */

+                                                                       $attachment_size = apply_filters( 'twentytwelve_attachment_size', array( 960, 960 ) );

+                                                                       echo wp_get_attachment_image( $post->ID, $attachment_size );

+                                                                       ?>

</ins><span class="cx" style="display: block; padding: 0 10px">                                                                 </a>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                                                <?php if ( ! empty( $post->post_excerpt ) ) : ?>

</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">                                <?php comments_template(); ?>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <?php endwhile; // end of the loop. ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <?php endwhile; // End of the loop. ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                </div><!-- #content -->

</span><span class="cx" style="display: block; padding: 0 10px">        </div><!-- #primary -->

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentytwelveinccustomheaderphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwelve/inc/custom-header.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwelve/inc/custom-header.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentytwelve/inc/custom-header.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -70,7 +70,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> function twentytwelve_header_style() {

</span><span class="cx" style="display: block; padding: 0 10px">        $text_color = get_header_textcolor();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // If no custom options for text are set, let's bail

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If no custom options for text are set, let's bail.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( $text_color == get_theme_support( 'custom-header', 'default-text-color' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                return;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentytwelveindexphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwelve/index.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwelve/index.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentytwelve/index.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,8 +20,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                <div id="content" role="main">

</span><span class="cx" style="display: block; padding: 0 10px">                <?php if ( have_posts() ) : ?>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <?php /* Start the Loop */ ?>

</del><span class="cx" style="display: block; padding: 0 10px">                         <?php

<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        // Start the Loop.

</ins><span class="cx" style="display: block; padding: 0 10px">                         while ( have_posts() ) :

</span><span class="cx" style="display: block; padding: 0 10px">                                the_post();

</span><span class="cx" style="display: block; padding: 0 10px">                                ?>

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -63,11 +63,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        <p><?php _e( 'Apologies, but no results were found. Perhaps searching will help find a related post.', 'twentytwelve' ); ?></p>

</span><span class="cx" style="display: block; padding: 0 10px">                                        <?php get_search_form(); ?>

</span><span class="cx" style="display: block; padding: 0 10px">                                </div><!-- .entry-content -->

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <?php endif; // end current_user_can() check ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <?php endif; // End current_user_can() check. ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        </article><!-- #post-0 -->

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <?php endif; // end have_posts() check ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <?php endif; // End have_posts() check. ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                </div><!-- #content -->

</span><span class="cx" style="display: block; padding: 0 10px">        </div><!-- #primary -->

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentytwelvejsthemecustomizerjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwelve/js/theme-customizer.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwelve/js/theme-customizer.js   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentytwelve/js/theme-customizer.js     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,7 +18,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                } );

</span><span class="cx" style="display: block; padding: 0 10px">        } );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Header text color

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Header text color.

</ins><span class="cx" style="display: block; padding: 0 10px">         wp.customize( 'header_textcolor', function( value ) {

</span><span class="cx" style="display: block; padding: 0 10px">                value.bind( function( to ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( 'blank' === to ) {

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentytwelvepagetemplatesfrontpagephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwelve/page-templates/front-page.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwelve/page-templates/front-page.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentytwelve/page-templates/front-page.php      2020-01-29 00:43:23 UTC (rev 47122)

</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">                                <?php get_template_part( 'content', 'page' ); ?>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <?php endwhile; // end of the loop. ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <?php endwhile; // End of the loop. ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                </div><!-- #content -->

</span><span class="cx" style="display: block; padding: 0 10px">        </div><!-- #primary -->

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentytwelvepagetemplatesfullwidthphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwelve/page-templates/full-width.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwelve/page-templates/full-width.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentytwelve/page-templates/full-width.php      2020-01-29 00:43:23 UTC (rev 47122)

</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">                                <?php get_template_part( 'content', 'page' ); ?>

</span><span class="cx" style="display: block; padding: 0 10px">                                <?php comments_template( '', true ); ?>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <?php endwhile; // end of the loop. ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <?php endwhile; // End of the loop. ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                </div><!-- #content -->

</span><span class="cx" style="display: block; padding: 0 10px">        </div><!-- #primary -->

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentytwelvepagephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwelve/page.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwelve/page.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentytwelve/page.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,7 +23,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                ?>

</span><span class="cx" style="display: block; padding: 0 10px">                                <?php get_template_part( 'content', 'page' ); ?>

</span><span class="cx" style="display: block; padding: 0 10px">                                <?php comments_template( '', true ); ?>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <?php endwhile; // end of the loop. ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <?php endwhile; // End of the loop. ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                </div><!-- #content -->

</span><span class="cx" style="display: block; padding: 0 10px">        </div><!-- #primary -->

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentytwelvesearchphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwelve/search.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwelve/search.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentytwelve/search.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,8 +25,8 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        <?php twentytwelve_content_nav( 'nav-above' ); ?>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <?php /* Start the Loop */ ?>

</del><span class="cx" style="display: block; padding: 0 10px">                         <?php

<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        // Start the Loop.

</ins><span class="cx" style="display: block; padding: 0 10px">                         while ( have_posts() ) :

</span><span class="cx" style="display: block; padding: 0 10px">                                the_post();

</span><span class="cx" style="display: block; padding: 0 10px">                                ?>

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentytwelvesinglephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwelve/single.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwelve/single.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentytwelve/single.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,7 +27,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                <?php comments_template( '', true ); ?>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <?php endwhile; // end of the loop. ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <?php endwhile; // End of the loop. ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                </div><!-- #content -->

</span><span class="cx" style="display: block; padding: 0 10px">        </div><!-- #primary -->

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentytwelvetagphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwelve/tag.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwelve/tag.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentytwelve/tag.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,19 +25,19 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                ?>

</span><span class="cx" style="display: block; padding: 0 10px">                                </h1>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <?php if ( tag_description() ) : // Show an optional tag description ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <?php if ( tag_description() ) : // Show an optional tag description. ?>

</ins><span class="cx" style="display: block; padding: 0 10px">                                 <div class="archive-meta"><?php echo tag_description(); ?></div>

</span><span class="cx" style="display: block; padding: 0 10px">                        <?php endif; ?>

</span><span class="cx" style="display: block; padding: 0 10px">                        </header><!-- .archive-header -->

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        <?php

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        /* Start the Loop */

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Start the Loop.

</ins><span class="cx" style="display: block; padding: 0 10px">                         while ( have_posts() ) :

</span><span class="cx" style="display: block; padding: 0 10px">                                the_post();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                /*

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                 * Include the post format-specific template for the content. If you want to

-                                * this in a child theme then include a file called content-___.php

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                          * Include the post format-specific template for the content. If you want

+                                * to use this in a child theme then include a file called content-___.php

</ins><span class="cx" style="display: block; padding: 0 10px">                                  * (where ___ is the post format) and that will be used instead.

</span><span class="cx" style="display: block; padding: 0 10px">                                 */

</span><span class="cx" style="display: block; padding: 0 10px">                                get_template_part( 'content', get_post_format() );

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentytwentyassetsjscolorcalculationsjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwenty/assets/js/color-calculations.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwenty/assets/js/color-calculations.js  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentytwenty/assets/js/color-calculations.js    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,6 +52,7 @@

<span class="cx" style="display: block; padding: 0 10px">                                 * Get a score for this color in contrast to its background color and surrounding text.

</span><span class="cx" style="display: block; padding: 0 10px">                                 *

</span><span class="cx" style="display: block; padding: 0 10px">                                 * @since Twenty Twenty 1.0

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 *

</ins><span class="cx" style="display: block; padding: 0 10px">                                  * @param {number} contrastBackground - WCAG contrast with the background color.

<span class="cx" style="display: block; padding: 0 10px">                                 * @param {number} contrastSurroundingText - WCAG contrast with surrounding text.

<span class="cx" style="display: block; padding: 0 10px">                                 * @return {number} - 0 is best, higher numbers have bigger difference with the desired scores.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -143,6 +144,7 @@

<span class="cx" style="display: block; padding: 0 10px">  * Return a new instance of the _twentyTwentyColor object.

</span><span class="cx" style="display: block; padding: 0 10px">  *

</span><span class="cx" style="display: block; padding: 0 10px">  * @since Twenty Twenty 1.0

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *

</ins><span class="cx" style="display: block; padding: 0 10px">  * @param {string} backgroundColor - The background color.

<span class="cx" style="display: block; padding: 0 10px">  * @param {number} accentHue - The hue for our accent color.

</span><span class="cx" style="display: block; padding: 0 10px">  * @return {Object} - this

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentytwentyassetsjscustomizepreviewjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwenty/assets/js/customize-preview.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwenty/assets/js/customize-preview.js   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentytwenty/assets/js/customize-preview.js     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,11 +25,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                return deferred.promise();

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Selective refresh for "Fixed Background Image"

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Selective refresh for "Fixed Background Image".

</ins><span class="cx" style="display: block; padding: 0 10px">         api.selectiveRefresh.partialConstructor.cover_fixed = api.selectiveRefresh.Partial.extend( {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 * Override the refresh method

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+          * Override the refresh method.

</ins><span class="cx" style="display: block; padding: 0 10px">                  *

<span class="cx" style="display: block; padding: 0 10px">                 * @return {jQuery.Promise} Resolved promise.

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,7 +49,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        } );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Selective refresh for "Image Overlay Opacity"

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Selective refresh for "Image Overlay Opacity".

</ins><span class="cx" style="display: block; padding: 0 10px">         api.selectiveRefresh.partialConstructor.cover_opacity = api.selectiveRefresh.Partial.extend( {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,7 +60,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                attrs: {},

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 * Override the refresh method

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+          * Override the refresh method.

</ins><span class="cx" style="display: block; padding: 0 10px">                  *

<span class="cx" style="display: block; padding: 0 10px">                 * @return {jQuery.Promise} Resolved promise.

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentytwentyassetsjsindexjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwenty/assets/js/index.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwenty/assets/js/index.js       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentytwenty/assets/js/index.js 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -70,7 +70,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> // Add a class to the body for when touch is enabled for browsers that don't support media queries

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// for interaction media features. Adapted from <https://codepen.io/Ferie/pen/vQOMmO>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// for interaction media features. Adapted from <https://codepen.io/Ferie/pen/vQOMmO>.

</ins><span class="cx" style="display: block; padding: 0 10px"> twentytwenty.touchEnabled = {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        init: function() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -95,21 +95,21 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        init: function() {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( document.querySelector( '.cover-modal' ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Handle cover modals when they're toggled

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Handle cover modals when they're toggled.

</ins><span class="cx" style="display: block; padding: 0 10px">                         this.onToggle();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // When toggled, untoggle if visitor clicks on the wrapping element of the modal

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // When toggled, untoggle if visitor clicks on the wrapping element of the modal.

</ins><span class="cx" style="display: block; padding: 0 10px">                         this.outsideUntoggle();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Close on escape key press

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Close on escape key press.

</ins><span class="cx" style="display: block; padding: 0 10px">                         this.closeOnEscape();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Hide and show modals before and after their animations have played out

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Hide and show modals before and after their animations have played out.

</ins><span class="cx" style="display: block; padding: 0 10px">                         this.hideAndShowModals();

</span><span class="cx" style="display: 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">-        // Handle cover modals when they're toggled

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Handle cover modals when they're toggled.

</ins><span class="cx" style="display: block; padding: 0 10px">         onToggle: function() {

</span><span class="cx" style="display: block; padding: 0 10px">                document.querySelectorAll( '.cover-modal' ).forEach( function( element ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        element.addEventListener( 'toggled', function( event ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -122,7 +122,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        body.classList.remove( 'showing-modal' );

</span><span class="cx" style="display: block; padding: 0 10px">                                        body.classList.add( 'hiding-modal' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Remove the hiding class after a delay, when animations have been run

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Remove the hiding class after a delay, when animations have been run.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         setTimeout( function() {

</span><span class="cx" style="display: block; padding: 0 10px">                                                body.classList.remove( 'hiding-modal' );

</span><span class="cx" style="display: block; padding: 0 10px">                                        }, 500 );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -131,7 +131,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                } );

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Close modal on outside click

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Close modal on outside click.

</ins><span class="cx" style="display: block; padding: 0 10px">         outsideUntoggle: function() {

</span><span class="cx" style="display: block; padding: 0 10px">                document.addEventListener( 'click', function( event ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        var target = event.target;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -143,7 +143,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }.bind( this ) );

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Close modal on escape key press

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Close modal on escape key press.

</ins><span class="cx" style="display: block; padding: 0 10px">         closeOnEscape: function() {

</span><span class="cx" style="display: block; padding: 0 10px">                document.addEventListener( 'keydown', function( event ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( event.keyCode === 27 ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -155,7 +155,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }.bind( this ) );

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Hide and show modals before and after their animations have played out

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Hide and show modals before and after their animations have played out.

</ins><span class="cx" style="display: block; padding: 0 10px">         hideAndShowModals: function() {

</span><span class="cx" style="display: block; padding: 0 10px">                var _doc = document,

</span><span class="cx" style="display: block; padding: 0 10px">                        _win = window,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -188,7 +188,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        };

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Show the modal

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Show the modal.

</ins><span class="cx" style="display: block; padding: 0 10px">                 modals.forEach( function( modal ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        modal.addEventListener( 'toggle-target-before-inactive', function( event ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                var styles = htmlStyles(),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -221,7 +221,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                modal.classList.add( 'show-modal' );

</span><span class="cx" style="display: block; padding: 0 10px">                        } );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Hide the modal after a delay, so animations have time to play out

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Hide the modal after a delay, so animations have time to play out.

</ins><span class="cx" style="display: block; padding: 0 10px">                         modal.addEventListener( 'toggle-target-after-inactive', function( event ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( event.target !== modal ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        return;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -254,13 +254,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                } );

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Untoggle a modal

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Untoggle a modal.

</ins><span class="cx" style="display: block; padding: 0 10px">         untoggleModal: function( modal ) {

</span><span class="cx" style="display: block; padding: 0 10px">                var modalTargetClass,

</span><span class="cx" style="display: block; padding: 0 10px">                        modalToggle = false;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If the modal has specified the string (ID or class) used by toggles to target it, untoggle the toggles with that target string

-               // The modal-target-string must match the string toggles use to target the modal

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If the modal has specified the string (ID or class) used by toggles to target it, untoggle the toggles with that target string.

+               // The modal-target-string must match the string toggles use to target the modal.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( modal.dataset.modalTargetString ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        modalTargetClass = modal.dataset.modalTargetString;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -267,11 +267,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        modalToggle = document.querySelector( '*[data-toggle-target="' + modalTargetClass + '"]' );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If a modal toggle exists, trigger it so all of the toggle options are included

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If a modal toggle exists, trigger it so all of the toggle options are included.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( modalToggle ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        modalToggle.click();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // If one doesn't exist, just hide the modal

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // If one doesn't exist, just hide the modal.

</ins><span class="cx" style="display: block; padding: 0 10px">                 } else {

</span><span class="cx" style="display: block; padding: 0 10px">                        modal.classList.remove( 'active' );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -298,13 +298,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        var ratio, iTargetWidth,

</span><span class="cx" style="display: block; padding: 0 10px">                                container = video.parentNode;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Skip videos we want to ignore

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Skip videos we want to ignore.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( video.classList.contains( 'intrinsic-ignore' ) || video.parentNode.classList.contains( 'intrinsic-ignore' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                return true;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! video.dataset.origwidth ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Get the video element proportions

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Get the video element proportions.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 video.setAttribute( 'data-origwidth', video.width );

</span><span class="cx" style="display: block; padding: 0 10px">                                video.setAttribute( 'data-origheight', video.height );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -311,10 +311,10 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        iTargetWidth = container.offsetWidth;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Get ratio from proportions

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Get ratio from proportions.

</ins><span class="cx" style="display: block; padding: 0 10px">                         ratio = iTargetWidth / video.dataset.origwidth;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Scale based on ratio, thus retaining proportions

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Scale based on ratio, thus retaining proportions.

</ins><span class="cx" style="display: block; padding: 0 10px">                         video.style.width = iTargetWidth + 'px';

</span><span class="cx" style="display: block; padding: 0 10px">                        video.style.height = ( video.dataset.origheight * ratio ) + 'px';

</span><span class="cx" style="display: block; padding: 0 10px">                } );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -328,7 +328,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> twentytwenty.modalMenu = {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        init: function() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If the current menu item is in a sub level, expand all the levels higher up on load

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If the current menu item is in a sub level, expand all the levels higher up on load.

</ins><span class="cx" style="display: block; padding: 0 10px">                 this.expandLevel();

</span><span class="cx" style="display: block; padding: 0 10px">                this.keepFocusInModal();

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -462,13 +462,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">        clickedEl: false,

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        init: function() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Do the toggle

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Do the toggle.

</ins><span class="cx" style="display: block; padding: 0 10px">                 this.toggle();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check for toggle/untoggle on resize

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check for toggle/untoggle on resize.

</ins><span class="cx" style="display: block; padding: 0 10px">                 this.resizeCheck();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check for untoggle on escape key press

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check for untoggle on escape key press.

</ins><span class="cx" style="display: block; padding: 0 10px">                 this.untoggleOnEscapeKeyPress();

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -476,12 +476,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                var target, timeOutTime, classToToggle,

</span><span class="cx" style="display: block; padding: 0 10px">                        self = this,

</span><span class="cx" style="display: block; padding: 0 10px">                        _doc = document,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Get our targets

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Get our targets.

</ins><span class="cx" style="display: block; padding: 0 10px">                         toggle = element,

</span><span class="cx" style="display: block; padding: 0 10px">                        targetString = toggle.dataset.toggleTarget,

</span><span class="cx" style="display: block; padding: 0 10px">                        activeClass = 'active';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Elements to focus after modals are closed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Elements to focus after modals are closed.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! _doc.querySelectorAll( '.show-modal' ).length ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        self.clickedEl = _doc.activeElement;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -492,7 +492,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        target = _doc.querySelector( targetString );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Trigger events on the toggle targets before they are toggled

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Trigger events on the toggle targets before they are toggled.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( target.classList.contains( activeClass ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        target.dispatchEvent( twentytwenty.createEvent( 'toggle-target-before-active' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                } else {

</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">                        target.dispatchEvent( twentytwenty.createEvent( 'toggle-target-before-inactive' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Get the class to toggle, if specified

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Get the class to toggle, if specified.

</ins><span class="cx" style="display: block; padding: 0 10px">                 classToToggle = toggle.dataset.classToToggle ? toggle.dataset.classToToggle : activeClass;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // For cover modals, set a short timeout duration so the class animations have time to play out

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // For cover modals, set a short timeout duration so the class animations have time to play out.

</ins><span class="cx" style="display: block; padding: 0 10px">                 timeOutTime = 0;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( target.classList.contains( 'cover-modal' ) ) {

</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">                                newTarget = subMenued ? toggle.closest( '.menu-item' ).querySelector( '.sub-menu' ) : target,

</span><span class="cx" style="display: block; padding: 0 10px">                                duration = toggle.dataset.toggleDuration;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Toggle the target of the clicked toggle

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Toggle the target of the clicked toggle.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( toggle.dataset.toggleType === 'slidetoggle' && ! instantly && duration !== '0' ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                twentytwentyMenuToggle( newTarget, duration );

</span><span class="cx" style="display: block; padding: 0 10px">                        } else {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -522,17 +522,17 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                newTarget.classList.toggle( classToToggle );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // If the toggle target is 'next', only give the clicked toggle the active class

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // If the toggle target is 'next', only give the clicked toggle the active class.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( targetString === 'next' ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                toggle.classList.toggle( activeClass );

</span><span class="cx" style="display: block; padding: 0 10px">                        } else if ( target.classList.contains( 'sub-menu' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                toggle.classList.toggle( activeClass );

</span><span class="cx" style="display: block; padding: 0 10px">                        } else {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // If not, toggle all toggles with this toggle target

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // If not, toggle all toggles with this toggle target.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 _doc.querySelector( '*[data-toggle-target="' + targetString + '"]' ).classList.toggle( activeClass );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Toggle aria-expanded on the toggle

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Toggle aria-expanded on the toggle.

</ins><span class="cx" style="display: block; padding: 0 10px">                         twentytwentyToggleAttribute( toggle, 'aria-expanded', 'true', 'false' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( self.clickedEl && -1 !== toggle.getAttribute( 'class' ).indexOf( 'close-' ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -539,12 +539,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                twentytwentyToggleAttribute( self.clickedEl, 'aria-expanded', 'true', 'false' );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Toggle body class

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Toggle body class.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( toggle.dataset.toggleBodyClass ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                _doc.body.classList.toggle( toggle.dataset.toggleBodyClass );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Check whether to set focus

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Check whether to set focus.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( toggle.dataset.setFocus ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                focusElement = _doc.querySelector( toggle.dataset.setFocus );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -557,10 +557,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Trigger the toggled event on the toggle target

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Trigger the toggled event on the toggle target.

</ins><span class="cx" style="display: block; padding: 0 10px">                         target.dispatchEvent( twentytwenty.createEvent( 'toggled' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Trigger events on the toggle targets after they are toggled

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Trigger events on the toggle targets after they are toggled.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( target.classList.contains( activeClass ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                target.dispatchEvent( twentytwenty.createEvent( 'toggle-target-after-active' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        } else {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -569,7 +569,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }, timeOutTime );

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Do the toggle

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Do the toggle.

</ins><span class="cx" style="display: block; padding: 0 10px">         toggle: function() {

</span><span class="cx" style="display: block; padding: 0 10px">                var self = this;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -581,7 +581,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">-        // Check for toggle/untoggle on screen resize

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Check for toggle/untoggle on screen resize.

</ins><span class="cx" style="display: block; padding: 0 10px">         resizeCheck: function() {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( document.querySelectorAll( '*[data-untoggle-above], *[data-untoggle-below], *[data-toggle-above], *[data-toggle-below]' ).length ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        window.addEventListener( 'resize', function() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -594,12 +594,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                                toggleAbove = toggle.dataset.toggleAbove,

</span><span class="cx" style="display: block; padding: 0 10px">                                                toggleBelow = toggle.dataset.toggleBelow;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // If no width comparison is set, continue

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // If no width comparison is set, continue.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         if ( ! unToggleAbove && ! unToggleBelow && ! toggleAbove && ! toggleBelow ) {

</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 the toggle width comparison is true, toggle the toggle

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // If the toggle width comparison is true, toggle the toggle.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         if (

</span><span class="cx" style="display: block; padding: 0 10px">                                                ( ( ( unToggleAbove && winWidth > unToggleAbove ) ||

</span><span class="cx" style="display: block; padding: 0 10px">                                                        ( unToggleBelow && winWidth < unToggleBelow ) ) &&

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -615,7 +615,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">-        // Close toggle on escape key press

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Close toggle on escape key press.

</ins><span class="cx" style="display: block; padding: 0 10px">         untoggleOnEscapeKeyPress: function() {

</span><span class="cx" style="display: block; padding: 0 10px">                document.addEventListener( 'keyup', function( event ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( event.key === 'Escape' ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -631,9 +631,9 @@

</span><span class="cx" style="display: block; padding: 0 10px"> }; // twentytwenty.toggles

</span><span class="cx" style="display: block; padding: 0 10px"> 

</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 the DOM ready

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Is the DOM ready?

</ins><span class="cx" style="display: block; padding: 0 10px">  *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * this implementation is coming from https://gomakethings.com/a-native-javascript-equivalent-of-jquerys-ready-method/

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * This implementation is coming from https://gomakethings.com/a-native-javascript-equivalent-of-jquerys-ready-method/

</ins><span class="cx" style="display: block; padding: 0 10px">  *

<span class="cx" style="display: block; padding: 0 10px">  * @param {Function} fn Callback function to run.

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -650,12 +650,12 @@

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> twentytwentyDomReady( function() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        twentytwenty.toggles.init();    // Handle toggles

-       twentytwenty.coverModals.init();        // Handle cover modals

-       twentytwenty.intrinsicRatioVideos.init();       // Retain aspect ratio of videos on window resize

-       twentytwenty.modalMenu.init();  // Modal Menu

-       twentytwenty.primaryMenu.init();        // Primary Menu

-       twentytwenty.touchEnabled.init();       // Add class to body if device is touch-enabled

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ twentytwenty.toggles.init();              // Handle toggles.

+       twentytwenty.coverModals.init();          // Handle cover modals.

+       twentytwenty.intrinsicRatioVideos.init(); // Retain aspect ratio of videos on window resize.

+       twentytwenty.modalMenu.init();            // Modal Menu.

+       twentytwenty.primaryMenu.init();          // Primary Menu.

+       twentytwenty.touchEnabled.init();         // Add class to body if device is touch-enabled.

</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">@@ -717,9 +717,11 @@

<span class="cx" style="display: block; padding: 0 10px">        // The whole process happens without giving the browser a chance to render, so it's invisible.

</span><span class="cx" style="display: block; padding: 0 10px">        target.classList.toggle( 'active' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Step 4: prepare animation.

-       // Position all the items with absolute offsets, at the same starting position.

-       // Shouldn't result in any visual changes if done right.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*

+        * Step 4: prepare animation.

+        * Position all the items with absolute offsets, at the same starting position.

+        * Shouldn't result in any visual changes if done right.

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         menu.classList.add( 'is-toggling' );

</span><span class="cx" style="display: block; padding: 0 10px">        target.classList.toggle( 'active' );

</span><span class="cx" style="display: block; padding: 0 10px">        menuItems.forEach( function( menuItem, index ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -730,15 +732,19 @@

</span><span class="cx" style="display: block; padding: 0 10px">                menuItem.style.transform = 'translate(' + initialPosition.x + 'px, ' + initialPosition.y + 'px)';

</span><span class="cx" style="display: block; padding: 0 10px">        } );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // The double rAF is unfortunately needed, since we're toggling CSS classes, and

-       // the only way to ensure layout completion here across browsers is to wait twice.

-       // This just delays the start of the animation by 2 frames and is thus not an issue.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*

+        * The double rAF is unfortunately needed, since we're toggling CSS classes, and

+        * the only way to ensure layout completion here across browsers is to wait twice.

+        * This just delays the start of the animation by 2 frames and is thus not an issue.

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         requestAnimationFrame( function() {

</span><span class="cx" style="display: block; padding: 0 10px">                requestAnimationFrame( function() {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Step 5: start animation by moving everything to final position.

-                       // All the layout work has already happened, while we were preparing for the animation.

-                       // The animation now runs entirely in CSS, using cheap CSS properties (opacity and transform)

-                       // that don't trigger the layout or paint stages.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 /*

+                        * Step 5: start animation by moving everything to final position.

+                        * All the layout work has already happened, while we were preparing for the animation.

+                        * The animation now runs entirely in CSS, using cheap CSS properties (opacity and transform)

+                        * that don't trigger the layout or paint stages.

+                        */

</ins><span class="cx" style="display: block; padding: 0 10px">                         menu.classList.add( 'is-animating' );

</span><span class="cx" style="display: block; padding: 0 10px">                        menuItems.forEach( function( menuItem, index ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                var finalPosition = finalPositions[ index ];

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -774,7 +780,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">- * traverses the DOM up to find elements matching the query

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Traverses the DOM up to find elements matching the query.

</ins><span class="cx" style="display: block; padding: 0 10px">  *

</span><span class="cx" style="display: block; padding: 0 10px">  * @param {HTMLElement} target

</span><span class="cx" style="display: block; padding: 0 10px">  * @param {string} query

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -783,7 +789,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> function twentytwentyFindParents( target, query ) {

</span><span class="cx" style="display: block; padding: 0 10px">        var parents = [];

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // recursively go up the DOM adding matches to the parents array

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Recursively go up the DOM adding matches to the parents array.

</ins><span class="cx" style="display: block; padding: 0 10px">         function traverse( item ) {

</span><span class="cx" style="display: block; padding: 0 10px">                var parent = item.parentNode;

</span><span class="cx" style="display: block; padding: 0 10px">                if ( parent instanceof HTMLElement ) {

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentytwentyclassesclasstwentytwentynonlatinlanguagesphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-non-latin-languages.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-non-latin-languages.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-non-latin-languages.php 2020-01-29 00:43:23 UTC (rev 47122)

</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">                public static function get_non_latin_css( $type = 'front-end' ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Fetch users locale.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Fetch site locale.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $locale = get_bloginfo( 'language' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                        // Define fallback fonts for non-latin languages.

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentytwentyclassesclasstwentytwentyscriptloaderphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-script-loader.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-script-loader.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-script-loader.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,7 +29,7 @@

<span class="cx" style="display: block; padding: 0 10px">                 * @return string Script HTML string.

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                public function filter_script_loader_tag( $tag, $handle ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        foreach ( [ 'async', 'defer' ] as $attr ) {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 foreach ( array( 'async', 'defer' ) as $attr ) {

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( ! wp_scripts()->get_data( $handle, $attr ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        continue;

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentytwentyclassesclasstwentytwentysvgiconsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-svg-icons.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-svg-icons.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-svg-icons.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,10 +32,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( array_key_exists( $icon, $arr ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $repl = '<svg class="svg-icon" aria-hidden="true" role="img" focusable="false" ';

</span><span class="cx" style="display: block; padding: 0 10px">                                $svg  = preg_replace( '/^<svg /', $repl, trim( $arr[ $icon ] ) ); // Add extra attributes to SVG code.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $svg  = str_replace( '#1A1A1B', $color, $svg ); // Replace the color.

-                               $svg  = str_replace( '#', '%23', $svg ); // Urlencode hashes.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $svg  = str_replace( '#1A1A1B', $color, $svg );   // Replace the color.

+                               $svg  = str_replace( '#', '%23', $svg );          // Urlencode hashes.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $svg  = preg_replace( "/([\n\t]+)/", ' ', $svg ); // Remove newlines & tabs.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $svg  = preg_replace( '/>\s*</', '><', $svg ); // Remove white space between SVG tags.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $svg  = preg_replace( '/>\s*</', '><', $svg );    // Remove whitespace between SVG tags.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 return $svg;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                        return null;

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentytwentyclassesclasstwentytwentywalkercommentphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-walker-comment.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-walker-comment.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-walker-comment.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,7 +33,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $tag = ( 'div' === $args['style'] ) ? 'div' : 'li';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        ?>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <<?php echo $tag; //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- static output ?> id="comment-<?php comment_ID(); ?>" <?php comment_class( $this->has_children ? 'parent' : '', $comment ); ?>>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <<?php echo $tag; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- static output ?> id="comment-<?php comment_ID(); ?>" <?php comment_class( $this->has_children ? 'parent' : '', $comment ); ?>>

</ins><span class="cx" style="display: block; padding: 0 10px">                                 <article id="div-comment-<?php comment_ID(); ?>" class="comment-body">

</span><span class="cx" style="display: block; padding: 0 10px">                                        <footer class="comment-meta">

</span><span class="cx" style="display: block; padding: 0 10px">                                                <div class="comment-author vcard">

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -45,7 +45,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                                                if ( empty( $comment_author_url ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                                        echo wp_kses_post( $avatar );

</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">-                                                                        printf( '<a href="%s" rel="external nofollow" class="url">', $comment_author_url ); //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped --Escaped in https://developer.wordpress.org/reference/functions/get_comment_author_url/

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                                 printf( '<a href="%s" rel="external nofollow" class="url">', $comment_author_url ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped --Escaped in https://developer.wordpress.org/reference/functions/get_comment_author_url/

</ins><span class="cx" style="display: block; padding: 0 10px">                                                                         echo wp_kses_post( $avatar );

</span><span class="cx" style="display: block; padding: 0 10px">                                                                }

</span><span class="cx" style="display: block; padding: 0 10px">                                                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,7 +65,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                                <div class="comment-metadata">

</span><span class="cx" style="display: block; padding: 0 10px">                                                        <a href="<?php echo esc_url( get_comment_link( $comment, $args ) ); ?>">

</span><span class="cx" style="display: block; padding: 0 10px">                                                                <?php

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                                /* Translators: 1 = comment date, 2 = comment time */

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                         /* translators: 1: Comment date, 2: Comment time. */

</ins><span class="cx" style="display: block; padding: 0 10px">                                                                 $comment_timestamp = sprintf( __( '%1$s at %2$s', 'twentytwenty' ), get_comment_date( '', $comment ), get_comment_time() );

</span><span class="cx" style="display: block; padding: 0 10px">                                                                ?>

</span><span class="cx" style="display: block; padding: 0 10px">                                                                <time datetime="<?php comment_time( 'c' ); ?>" title="<?php echo esc_attr( $comment_timestamp ); ?>">

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -121,7 +121,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                                        <?php

</span><span class="cx" style="display: block; padding: 0 10px">                                                        if ( $comment_reply_link ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                                echo $comment_reply_link; //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped --Link is escaped in https://developer.wordpress.org/reference/functions/get_comment_reply_link/

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                         echo $comment_reply_link; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Link is escaped in https://developer.wordpress.org/reference/functions/get_comment_reply_link/

</ins><span class="cx" style="display: block; padding: 0 10px">                                                         }

</span><span class="cx" style="display: block; padding: 0 10px">                                                        if ( $by_post_author ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                                echo '<span class="by-post-author">' . __( 'By Post Author', 'twentytwenty' ) . '</span>';

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentytwentyclassesclasstwentytwentywalkerpagephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-walker-page.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-walker-page.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-walker-page.php 2020-01-29 00:43:23 UTC (rev 47122)

</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">                        $css_classes = $css_classes ? ' class="' . esc_attr( $css_classes ) . '"' : '';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( '' === $page->post_title ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                /* translators: %d: ID of a post */

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         /* translators: %d: ID of a post. */

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $page->post_title = sprintf( __( '#%d (no title)', 'twentytwenty' ), $page->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="trunksrcwpcontentthemestwentytwentycommentsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwenty/comments.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwenty/comments.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentytwenty/comments.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,11 +33,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! have_comments() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                _e( 'Leave a comment', 'twentytwenty' );

</span><span class="cx" style="display: block; padding: 0 10px">                        } elseif ( '1' === $comments_number ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                /* translators: %s: post title */

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         /* translators: %s: Post title. */

</ins><span class="cx" style="display: block; padding: 0 10px">                                 printf( _x( 'One reply on &ldquo;%s&rdquo;', 'comments title', 'twentytwenty' ), get_the_title() );

</span><span class="cx" style="display: block; padding: 0 10px">                        } else {

</span><span class="cx" style="display: block; padding: 0 10px">                                printf(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        /* translators: 1: number of comments, 2: post title */

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 /* translators: 1: Number of comments, 2: Post title. */

</ins><span class="cx" style="display: block; padding: 0 10px">                                         _nx(

</span><span class="cx" style="display: block; padding: 0 10px">                                                '%1$s reply on &ldquo;%2$s&rdquo;',

</span><span class="cx" style="display: block; padding: 0 10px">                                                '%1$s replies on &ldquo;%2$s&rdquo;',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -85,7 +85,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">-                                <nav class="comments-pagination pagination<?php echo $pagination_classes; //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- static output ?>" aria-label="<?php esc_attr_e( 'Comments', 'twentytwenty' ); ?>">

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <nav class="comments-pagination pagination<?php echo $pagination_classes; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- static output ?>" aria-label="<?php esc_attr_e( 'Comments', 'twentytwenty' ); ?>">

</ins><span class="cx" style="display: block; padding: 0 10px">                                         <?php echo wp_kses_post( $comment_pagination ); ?>

</span><span class="cx" style="display: block; padding: 0 10px">                                </nav>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentytwentyfooterphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwenty/footer.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwenty/footer.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentytwenty/footer.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,13 +39,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        <a class="to-the-top" href="#site-header">

</span><span class="cx" style="display: block; padding: 0 10px">                                                <span class="to-the-top-long">

</span><span class="cx" style="display: block; padding: 0 10px">                                                        <?php

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                        /* translators: %s: HTML character for up arrow */

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 /* translators: %s: HTML character for up arrow. */

</ins><span class="cx" style="display: block; padding: 0 10px">                                                         printf( __( 'To the top %s', 'twentytwenty' ), '<span class="arrow" aria-hidden="true">&uarr;</span>' );

</span><span class="cx" style="display: block; padding: 0 10px">                                                        ?>

</span><span class="cx" style="display: block; padding: 0 10px">                                                </span><!-- .to-the-top-long -->

</span><span class="cx" style="display: block; padding: 0 10px">                                                <span class="to-the-top-short">

</span><span class="cx" style="display: block; padding: 0 10px">                                                        <?php

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                        /* translators: %s: HTML character for up arrow */

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 /* translators: %s: HTML character for up arrow. */

</ins><span class="cx" style="display: block; padding: 0 10px">                                                         printf( __( 'Up %s', 'twentytwenty' ), '<span class="arrow" aria-hidden="true">&uarr;</span>' );

</span><span class="cx" style="display: block; padding: 0 10px">                                                        ?>

</span><span class="cx" style="display: block; padding: 0 10px">                                                </span><!-- .to-the-top-short -->

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentytwentyfunctionsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwenty/functions.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwenty/functions.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentytwenty/functions.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -324,7 +324,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! function_exists( 'wp_body_open' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Shim for wp_body_open, ensuring backwards compatibility with versions of WordPress older than 5.2.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Shim for wp_body_open, ensuring backward compatibility with versions of WordPress older than 5.2.

</ins><span class="cx" style="display: block; padding: 0 10px">          */

</span><span class="cx" style="display: block; padding: 0 10px">        function wp_body_open() {

</span><span class="cx" style="display: block; padding: 0 10px">                do_action( 'wp_body_open' );

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentytwentyinccustomcssphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwenty/inc/custom-css.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwenty/inc/custom-css.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentytwenty/inc/custom-css.php 2020-01-29 00:43:23 UTC (rev 47122)

</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"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $echo ) {

</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 $return; //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- We need to double check this, but for now, we want to pass PHPCS ;)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 echo $return; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- We need to double check this, but for now, we want to pass PHPCS ;)

</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="trunksrcwpcontentthemestwentytwentyincsvgiconsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwenty/inc/svg-icons.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwenty/inc/svg-icons.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentytwenty/inc/svg-icons.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,7 +17,7 @@

<span class="cx" style="display: block; padding: 0 10px">         * @param string $color Color code.

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function twentytwenty_the_theme_svg( $svg_name, $group = 'ui', $color = '' ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                echo twentytwenty_get_theme_svg( $svg_name, $group, $color ); //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Escaped in twentytwenty_get_theme_svg();.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         echo twentytwenty_get_theme_svg( $svg_name, $group, $color ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Escaped in twentytwenty_get_theme_svg().

</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="trunksrcwpcontentthemestwentytwentyinctemplatetagsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwenty/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/twentytwenty/inc/template-tags.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentytwenty/inc/template-tags.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,7 +81,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                return $html;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        echo $html; //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo $html; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped

</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">@@ -118,7 +118,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                return $html;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        echo $html; //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo $html; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped

</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">@@ -178,7 +178,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function twentytwenty_the_post_meta( $post_id = null, $location = 'single-top' ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        echo twentytwenty_get_post_meta( $post_id, $location ); //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Escaped in twentytwenty_get_post_meta().

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo twentytwenty_get_post_meta( $post_id, $location ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Escaped in twentytwenty_get_post_meta().

</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">@@ -350,7 +350,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                                <span class="meta-text">

</span><span class="cx" style="display: block; padding: 0 10px">                                                        <?php

</span><span class="cx" style="display: block; padding: 0 10px">                                                        printf(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                                /* translators: %s: Author name */

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                         /* translators: %s: Author name. */

</ins><span class="cx" style="display: block; padding: 0 10px">                                                                 __( 'By %s', 'twentytwenty' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                                                '<a href="' . esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ) . '">' . esc_html( get_the_author_meta( 'display_name' ) ) . '</a>'

</span><span class="cx" style="display: block; padding: 0 10px">                                                        );

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentytwentyindexphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwenty/index.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwenty/index.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentytwenty/index.php  2020-01-29 00:43:23 UTC (rev 47122)

</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"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $wp_query->found_posts ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $archive_subtitle = sprintf(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                /* translators: %s: Number of search results */

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         /* translators: %s: Number of search results. */

</ins><span class="cx" style="display: block; padding: 0 10px">                                 _n(

</span><span class="cx" style="display: block; padding: 0 10px">                                        'We found %s result for your search.',

</span><span class="cx" style="display: block; padding: 0 10px">                                        'We found %s results for your search.',

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentytwentysearchformphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwenty/searchform.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwenty/searchform.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentytwenty/searchform.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,8 +12,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> /*

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Generate a unique ID for each form and a string containing an aria-label if

- * one was passed to get_search_form() in the args array.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Generate a unique ID for each form and a string containing an aria-label

+ * if one was passed to get_search_form() in the args array.

</ins><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> $unique_id = twentytwenty_unique_id( 'search-form-' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentytwentytemplatepartscontentcoverphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwenty/template-parts/content-cover.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwenty/template-parts/content-cover.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentytwenty/template-parts/content-cover.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,10 +44,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $color_overlay_classes .= ' opacity-' . $color_overlay_opacity;

</span><span class="cx" style="display: block; padding: 0 10px">        ?>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        <div class="cover-header <?php echo $cover_header_classes; //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- static output ?>"<?php echo $cover_header_style; //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- We need to double check this, but for now, we want to pass PHPCS ;) ?>>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="cover-header <?php echo $cover_header_classes; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- static output ?>"<?php echo $cover_header_style; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- We need to double check this, but for now, we want to pass PHPCS ;) ?>>

</ins><span class="cx" style="display: block; padding: 0 10px">                 <div class="cover-header-inner-wrapper screen-height">

</span><span class="cx" style="display: block; padding: 0 10px">                        <div class="cover-header-inner">

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <div class="cover-color-overlay color-accent<?php echo esc_attr( $color_overlay_classes ); ?>"<?php echo $color_overlay_style; //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- We need to double check this, but for now, we want to pass PHPCS ;) ?>></div>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <div class="cover-color-overlay color-accent<?php echo esc_attr( $color_overlay_classes ); ?>"<?php echo $color_overlay_style; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- We need to double check this, but for now, we want to pass PHPCS ;) ?>></div>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                        <header class="entry-header has-text-align-center">

</span><span class="cx" style="display: block; padding: 0 10px">                                                <div class="entry-header-inner section-inner medium">

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentytwentytemplatepartsentryauthorbiophp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwenty/template-parts/entry-author-bio.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwenty/template-parts/entry-author-bio.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentytwenty/template-parts/entry-author-bio.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,7 +16,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                <h2 class="author-title heading-size-4">

</span><span class="cx" style="display: block; padding: 0 10px">                        <?php

</span><span class="cx" style="display: block; padding: 0 10px">                        printf(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                /* translators: %s: Author name */

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         /* translators: %s: Author name. */

</ins><span class="cx" style="display: block; padding: 0 10px">                                 __( 'By %s', 'twentytwenty' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                esc_html( get_the_author() )

</span><span class="cx" style="display: block; padding: 0 10px">                        );

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentytwentytemplatepartsentryheaderphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwenty/template-parts/entry-header.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwenty/template-parts/entry-header.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentytwenty/template-parts/entry-header.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -59,7 +59,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                if ( has_excerpt() && is_singular() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        ?>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <div class="intro-text section-inner max-percentage<?php echo $intro_text_width; //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- static output ?>">

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <div class="intro-text section-inner max-percentage<?php echo $intro_text_width; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- static output ?>">

</ins><span class="cx" style="display: block; padding: 0 10px">                                 <?php the_excerpt(); ?>

</span><span class="cx" style="display: block; padding: 0 10px">                        </div>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentytwentytemplatepartsfeaturedimagephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwenty/template-parts/featured-image.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwenty/template-parts/featured-image.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentytwenty/template-parts/featured-image.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,7 +19,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        <figure class="featured-media">

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <div class="featured-media-inner section-inner<?php echo $featured_media_inner_classes; //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- static output ?>">

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <div class="featured-media-inner section-inner<?php echo $featured_media_inner_classes; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- static output ?>">

</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">                        the_post_thumbnail();

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentytwentytemplatepartsfootermenuswidgetsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwenty/template-parts/footer-menus-widgets.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwenty/template-parts/footer-menus-widgets.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentytwenty/template-parts/footer-menus-widgets.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,7 +31,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( $has_footer_menu || $has_social_menu ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                ?>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <div class="footer-top<?php echo $footer_top_classes; //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- static output ?>">

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <div class="footer-top<?php echo $footer_top_classes; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- static output ?>">

</ins><span class="cx" style="display: block; padding: 0 10px">                                         <?php if ( $has_footer_menu ) { ?>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                                <nav aria-label="<?php esc_attr_e( 'Footer', 'twentytwenty' ); ?>" role="navigation" class="footer-menu-wrapper">

</span></span></pre></div>

<a id="trunksrcwpcontentthemestwentytwentytemplatepartspaginationphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwenty/template-parts/pagination.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwenty/template-parts/pagination.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-content/themes/twentytwenty/template-parts/pagination.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,12 +34,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">        )

</span><span class="cx" style="display: block; padding: 0 10px"> );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// If we're not outputting the previous page link, prepend a placeholder with visibility: hidden to take its place.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// If we're not outputting the previous page link, prepend a placeholder with `visibility: hidden` to take its place.

</ins><span class="cx" style="display: block; padding: 0 10px"> if ( strpos( $posts_pagination, 'prev page-numbers' ) === false ) {

</span><span class="cx" style="display: block; padding: 0 10px">        $posts_pagination = str_replace( '<div class="nav-links">', '<div class="nav-links"><span class="prev page-numbers placeholder" aria-hidden="true">' . $prev_text . '</span>', $posts_pagination );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// If we're not outputting the next page link, append a placeholder with visibility: hidden to take its place.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// If we're not outputting the next page link, append a placeholder with `visibility: hidden` to take its place.

</ins><span class="cx" style="display: block; padding: 0 10px"> if ( strpos( $posts_pagination, 'next page-numbers' ) === false ) {

</span><span class="cx" style="display: block; padding: 0 10px">        $posts_pagination = str_replace( '</div>', '<span class="next page-numbers placeholder" aria-hidden="true">' . $next_text . '</span></div>', $posts_pagination );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,7 +50,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                <hr class="styled-separator pagination-separator is-style-wide" aria-hidden="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">-                <?php echo $posts_pagination; //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- already escaped during generation. ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <?php echo $posts_pagination; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- already escaped during generation. ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        </div><!-- .pagination-wrapper -->

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunksrcwpincludesadminbarphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/admin-bar.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/admin-bar.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/admin-bar.php 2020-01-29 00:43:23 UTC (rev 47122)

</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">        $wp_admin_bar->add_node( $wp_logo_menu_args );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( $about_url ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Add "About WordPress" link

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Add "About WordPress" link.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $wp_admin_bar->add_node(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'parent' => 'wp-logo',

</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">                );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Add WordPress.org link

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Add WordPress.org link.

</ins><span class="cx" style="display: block; padding: 0 10px">         $wp_admin_bar->add_node(

</span><span class="cx" style="display: block; padding: 0 10px">                array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'parent' => 'wp-logo-external',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -155,7 +155,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                )

</span><span class="cx" style="display: block; padding: 0 10px">        );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Add codex link

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Add Codex link.

</ins><span class="cx" style="display: block; padding: 0 10px">         $wp_admin_bar->add_node(

</span><span class="cx" style="display: block; padding: 0 10px">                array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'parent' => 'wp-logo-external',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -165,7 +165,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                )

</span><span class="cx" style="display: block; padding: 0 10px">        );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Add forums link

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Add forums link.

</ins><span class="cx" style="display: block; padding: 0 10px">         $wp_admin_bar->add_node(

</span><span class="cx" style="display: block; padding: 0 10px">                array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'parent' => 'wp-logo-external',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -175,7 +175,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">-        // Add feedback link

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Add feedback link.

</ins><span class="cx" style="display: block; padding: 0 10px">         $wp_admin_bar->add_node(

</span><span class="cx" style="display: block; padding: 0 10px">                array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'parent' => 'wp-logo-external',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -555,7 +555,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Add site links

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Add site links.

</ins><span class="cx" style="display: block; padding: 0 10px">         $wp_admin_bar->add_group(

</span><span class="cx" style="display: block; padding: 0 10px">                array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'parent' => 'my-sites',

</span></span></pre></div>

<a id="trunksrcwpincludesauthortemplatephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/author-template.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/author-template.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/author-template.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -566,6 +566,6 @@

</span><span class="cx" style="display: block; padding: 0 10px">  * @since 3.2.0

</span><span class="cx" style="display: block; padding: 0 10px">  * @access private

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function __clear_multi_author_cache() { //phpcs:ignore WordPress.NamingConventions.ValidFunctionName.FunctionDoubleUnderscore,PHPCompatibility.FunctionNameRestrictions.ReservedFunctionNames.FunctionDoubleUnderscore

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function __clear_multi_author_cache() { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.FunctionDoubleUnderscore,PHPCompatibility.FunctionNameRestrictions.ReservedFunctionNames.FunctionDoubleUnderscore

</ins><span class="cx" style="display: block; padding: 0 10px">         delete_transient( 'is_multi_author' );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span></span></pre></div>

<a id="trunksrcwpincludesbookmarktemplatephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/bookmark-template.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/bookmark-template.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/bookmark-template.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -116,7 +116,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $bookmark->link_image != null && $parsed_args['show_images'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( strpos( $bookmark->link_image, 'http' ) === 0 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $output .= "<img src=\"$bookmark->link_image\" $alt $title />";

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        } else { // If it's a relative path

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 } else { // If it's a relative path.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $output .= '<img src="' . get_option( 'siteurl' ) . "$bookmark->link_image\" $alt $title />";

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( $parsed_args['show_name'] ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -147,7 +147,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">                $output .= $parsed_args['after'] . "\n";

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        } // end while

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } // End while.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        return $output;

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -254,7 +254,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 ( $parsed_args['categorize'] ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Split the bookmarks into ul's for each category

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Split the bookmarks into ul's for each category.

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( (array) $cats as $cat ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $params    = array_merge( $parsed_args, array( 'category' => $cat->term_id ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $bookmarks = get_bookmarks( $params );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -284,7 +284,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $output .= $parsed_args['category_after'] . "\n";

</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">-                //output one single list using title_li for the title

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Output one single list using title_li for the title.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $bookmarks = get_bookmarks( $parsed_args );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! empty( $bookmarks ) ) {

</span></span></pre></div>

<a id="trunksrcwpincludesbookmarkphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/bookmark.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/bookmark.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/bookmark.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -180,7 +180,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $inclusions = '';

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! empty( $parsed_args['include'] ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $parsed_args['exclude']       = '';  //ignore exclude, category, and category_name params if using include

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $parsed_args['exclude']       = '';  // Ignore exclude, category, and category_name params if using include.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $parsed_args['category']      = '';

</span><span class="cx" style="display: block; padding: 0 10px">                $parsed_args['category_name'] = '';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -404,7 +404,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                case 'link_category': // array( ints )

</span><span class="cx" style="display: block; padding: 0 10px">                        $value = array_map( 'absint', (array) $value );

<span class="cx" style="display: block; padding: 0 10px">                        // We return here so that the categories aren't filtered.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // The 'link_category' filter is for the name of a link category, not an array of a link's link categories

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // The 'link_category' filter is for the name of a link category, not an array of a link's link categories.

</ins><span class="cx" style="display: block; padding: 0 10px">                         return $value;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                case 'link_visible': // bool stored as Y|N

</span></span></pre></div>

<a id="trunksrcwpincludescanonicalphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/canonical.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/canonical.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/canonical.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -47,7 +47,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        // If we're not in wp-admin and the post has been published and preview nonce

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // is non-existent or invalid then no need for preview in query

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // is non-existent or invalid then no need for preview in query.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( is_preview() && get_query_var( 'p' ) && 'publish' == get_post_status( get_query_var( 'p' ) ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! isset( $_GET['preview_id'] )

</span><span class="cx" style="display: block; padding: 0 10px">                        || ! isset( $_GET['preview_nonce'] )

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -61,7 +61,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! $requested_url && isset( $_SERVER['HTTP_HOST'] ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // build the URL in the address bar

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Build the URL in the address bar.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $requested_url  = is_ssl() ? 'https://' : 'http://';

</span><span class="cx" style="display: block; padding: 0 10px">                $requested_url .= $_SERVER['HTTP_HOST'];

</span><span class="cx" style="display: block; padding: 0 10px">                $requested_url .= $_SERVER['REQUEST_URI'];

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,7 +75,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $redirect     = $original;

</span><span class="cx" style="display: block; padding: 0 10px">        $redirect_url = 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">-        // Notice fixing

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Notice fixing.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! isset( $redirect['path'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $redirect['path'] = '';

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,12 +83,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $redirect['query'] = '';

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // If the original URL ended with non-breaking spaces, they were almost

-       // certainly inserted by accident. Let's remove them, so the reader doesn't

-       // see a 404 error with no obvious cause.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*

+        * If the original URL ended with non-breaking spaces, they were almost

+        * certainly inserted by accident. Let's remove them, so the reader doesn't

+        * see a 404 error with no obvious cause.

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         $redirect['path'] = preg_replace( '|(%C2%A0)+$|i', '', $redirect['path'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // It's not a preview, so remove it from URL

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // It's not a preview, so remove it from URL.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( get_query_var( 'preview' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $redirect['query'] = remove_query_arg( 'preview', $redirect['query'] );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -120,10 +122,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // These tests give us a WP-generated permalink

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // These tests give us a WP-generated permalink.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( is_404() ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Redirect ?page_id, ?p=, ?attachment_id= to their respective url's

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Redirect ?page_id, ?p=, ?attachment_id= to their respective URLs.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $id            = max( get_query_var( 'p' ), get_query_var( 'page_id' ), get_query_var( 'attachment_id' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $redirect_post = $id ? get_post( $id ) : false;

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $redirect_post ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -162,7 +164,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $redirect_url      = get_permalink( $wp_query->post->ID );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        } elseif ( is_object( $wp_rewrite ) && $wp_rewrite->using_permalinks() ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // rewriting of old ?p=X, ?m=2004, ?m=200401, ?m=20040101

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Rewriting of old ?p=X, ?m=2004, ?m=200401, ?m=20040101.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( is_attachment() &&

</span><span class="cx" style="display: block; padding: 0 10px">                        ! array_diff( array_keys( $wp->query_vars ), array( 'attachment', 'attachment_id' ) ) &&

</span><span class="cx" style="display: block; padding: 0 10px">                        ! $redirect_url ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -199,13 +201,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                } elseif ( ! empty( $_GET['m'] ) && ( is_year() || is_month() || is_day() ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $m = get_query_var( 'm' );

</span><span class="cx" style="display: block; padding: 0 10px">                        switch ( strlen( $m ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                case 4: // Yearly

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         case 4: // Yearly.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         $redirect_url = get_year_link( $m );

</span><span class="cx" style="display: block; padding: 0 10px">                                        break;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                case 6: // Monthly

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         case 6: // Monthly.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         $redirect_url = get_month_link( substr( $m, 0, 4 ), substr( $m, 4, 2 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                                        break;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                case 8: // Daily

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         case 8: // Daily.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         $redirect_url = get_day_link( substr( $m, 0, 4 ), substr( $m, 4, 2 ), substr( $m, 6, 2 ) );

</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">@@ -212,7 +214,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( $redirect_url ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $redirect['query'] = remove_query_arg( 'm', $redirect['query'] );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // now moving on to non ?m=X year/month/day links

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Now moving on to non ?m=X year/month/day links.

</ins><span class="cx" style="display: block; padding: 0 10px">                 } elseif ( is_day() && get_query_var( 'year' ) && get_query_var( 'monthnum' ) && ! empty( $_GET['day'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $redirect_url = get_day_link( get_query_var( 'year' ), get_query_var( 'monthnum' ), get_query_var( 'day' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( $redirect_url ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -236,7 +238,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        $redirect['query'] = remove_query_arg( 'author', $redirect['query'] );

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                } elseif ( is_category() || is_tag() || is_tax() ) { // Terms (Tags/categories)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         } elseif ( is_category() || is_tag() || is_tax() ) { // Terms (tags/categories).

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $term_count = 0;

</span><span class="cx" style="display: block; padding: 0 10px">                        foreach ( $wp_query->tax_query->queried_terms as $tax_query ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -248,7 +250,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                $tax_url = get_term_link( (int) $obj->term_id, $obj->taxonomy );

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( $tax_url && ! is_wp_error( $tax_url ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        if ( ! empty( $redirect['query'] ) ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                // Strip taxonomy query vars off the url.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         // Strip taxonomy query vars off the URL.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                 $qv_remove = array( 'term', 'taxonomy' );

</span><span class="cx" style="display: block; padding: 0 10px">                                                if ( is_category() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                        $qv_remove[] = 'category_name';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -256,7 +258,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                                } elseif ( is_tag() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                        $qv_remove[] = 'tag';

</span><span class="cx" style="display: block; padding: 0 10px">                                                        $qv_remove[] = 'tag_id';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                } else { // Custom taxonomies will have a custom query var, remove those too:

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         } else {

+                                                       // Custom taxonomies will have a custom query var, remove those too.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                         $tax_obj = get_taxonomy( $obj->taxonomy );

</span><span class="cx" style="display: block; padding: 0 10px">                                                        if ( false !== $tax_obj->query_var ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                                $qv_remove[] = $tax_obj->query_var;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -265,18 +268,23 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                                $rewrite_vars = array_diff( array_keys( $wp_query->query ), array_keys( $_GET ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                if ( ! array_diff( $rewrite_vars, array_keys( $_GET ) ) ) { // Check to see if all the Query vars are coming from the rewrite, none are set via $_GET

-                                                       $redirect['query'] = remove_query_arg( $qv_remove, $redirect['query'] ); //Remove all of the per-tax qv's

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         // Check to see if all the query vars are coming from the rewrite, none are set via $_GET.

+                                               if ( ! array_diff( $rewrite_vars, array_keys( $_GET ) ) ) {

+                                                       // Remove all of the per-tax query vars.

+                                                       $redirect['query'] = remove_query_arg( $qv_remove, $redirect['query'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                        // Create the destination url for this taxonomy

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 // Create the destination URL for this taxonomy.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                         $tax_url = parse_url( $tax_url );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                        if ( ! empty( $tax_url['query'] ) ) { // Taxonomy accessible via ?taxonomy=..&term=.. or any custom qv..

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 if ( ! empty( $tax_url['query'] ) ) {

+                                                               // Taxonomy accessible via ?taxonomy=...&term=... or any custom query var.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                                 parse_str( $tax_url['query'], $query_vars );

</span><span class="cx" style="display: block; padding: 0 10px">                                                                $redirect['query'] = add_query_arg( $query_vars, $redirect['query'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                        } else { // Taxonomy is accessible via a "pretty-URL"

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 } else {

+                                                               // Taxonomy is accessible via a "pretty URL".

</ins><span class="cx" style="display: block; padding: 0 10px">                                                                 $redirect['path'] = $tax_url['path'];

</span><span class="cx" style="display: block; padding: 0 10px">                                                        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                } else { // Some query vars are set via $_GET. Unset those from $_GET that exist via the rewrite

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         } else {

+                                                       // Some query vars are set via $_GET. Unset those from $_GET that exist via the rewrite.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                         foreach ( $qv_remove as $_qv ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                                if ( isset( $rewrite_vars[ $_qv ] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                                        $redirect['query'] = remove_query_arg( $_qv, $redirect['query'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -296,7 +304,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">-                        // Post Paging

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Post paging.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( is_singular() && get_query_var( 'page' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! $redirect_url ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $redirect_url = get_permalink( get_queried_object_id() );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -313,13 +321,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                $redirect['query'] = remove_query_arg( 'page', $redirect['query'] );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // paging and feeds

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Paging and feeds.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( get_query_var( 'paged' ) || is_feed() || get_query_var( 'cpage' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        while ( preg_match( "#/$wp_rewrite->pagination_base/?[0-9]+?(/+)?$#", $redirect['path'] ) || preg_match( '#/(comments/?)?(feed|rss|rdf|atom|rss2)(/+)?$#', $redirect['path'] ) || preg_match( "#/{$wp_rewrite->comments_pagination_base}-[0-9]+(/+)?$#", $redirect['path'] ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Strip off paging and feed

-                               $redirect['path'] = preg_replace( "#/$wp_rewrite->pagination_base/?[0-9]+?(/+)?$#", '/', $redirect['path'] ); // strip off any existing paging

-                               $redirect['path'] = preg_replace( '#/(comments/?)?(feed|rss2?|rdf|atom)(/+|$)#', '/', $redirect['path'] ); // strip off feed endings

-                               $redirect['path'] = preg_replace( "#/{$wp_rewrite->comments_pagination_base}-[0-9]+?(/+)?$#", '/', $redirect['path'] ); // strip off any existing comment paging

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Strip off paging and feed.

+                               $redirect['path'] = preg_replace( "#/$wp_rewrite->pagination_base/?[0-9]+?(/+)?$#", '/', $redirect['path'] ); // Strip off any existing paging.

+                               $redirect['path'] = preg_replace( '#/(comments/?)?(feed|rss2?|rdf|atom)(/+|$)#', '/', $redirect['path'] ); // Strip off feed endings.

+                               $redirect['path'] = preg_replace( "#/{$wp_rewrite->comments_pagination_base}-[0-9]+?(/+)?$#", '/', $redirect['path'] ); // Strip off any existing comment paging.

</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">                        $addl_path = '';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -372,7 +380,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                $redirect['query'] = remove_query_arg( 'cpage', $redirect['query'] );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $redirect['path'] = user_trailingslashit( preg_replace( '|/' . preg_quote( $wp_rewrite->index, '|' ) . '/?$|', '/', $redirect['path'] ) ); // strip off trailing /index.php/

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $redirect['path'] = user_trailingslashit( preg_replace( '|/' . preg_quote( $wp_rewrite->index, '|' ) . '/?$|', '/', $redirect['path'] ) ); // Strip off trailing /index.php/.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( ! empty( $addl_path ) && $wp_rewrite->using_index_permalinks() && strpos( $redirect['path'], '/' . $wp_rewrite->index . '/' ) === false ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $redirect['path'] = trailingslashit( $redirect['path'] ) . $wp_rewrite->index . '/';

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -395,7 +403,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">-        // tack on any additional query vars

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Tack on any additional query vars.

</ins><span class="cx" style="display: block; padding: 0 10px">         $redirect['query'] = preg_replace( '#^\??&*?#', '', $redirect['query'] );

</span><span class="cx" style="display: block; padding: 0 10px">        if ( $redirect_url && ! empty( $redirect['query'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                parse_str( $redirect['query'], $_parsed_query );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -420,7 +428,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $redirect = @parse_url( $redirect_url );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // www.example.com vs example.com

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // www.example.com vs. example.com

</ins><span class="cx" style="display: block; padding: 0 10px">         $user_home = @parse_url( home_url() );

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! empty( $user_home['host'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $redirect['host'] = $user_home['host'];

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -429,7 +437,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $user_home['path'] = '/';

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Handle ports

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Handle ports.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! empty( $user_home['port'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $redirect['port'] = $user_home['port'];

</span><span class="cx" style="display: block; padding: 0 10px">        } else {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -436,7 +444,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                unset( $redirect['port'] );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // trailing /index.php

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Trailing /index.php.

</ins><span class="cx" style="display: block; padding: 0 10px">         $redirect['path'] = preg_replace( '|/' . preg_quote( $wp_rewrite->index, '|' ) . '/*?$|', '/', $redirect['path'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $punctuation_pattern = implode(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -445,29 +453,29 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'preg_quote',

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                ' ',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                '%20',  // space

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         '%20',  // Space.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '!',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                '%21',  // exclamation mark

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         '%21',  // Exclamation mark.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '"',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                '%22',  // double quote

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         '%22',  // Double quote.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 "'",

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                '%27',  // single quote

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         '%27',  // Single quote.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '(',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                '%28',  // opening bracket

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         '%28',  // Opening bracket.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 ')',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                '%29',  // closing bracket

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         '%29',  // Closing bracket.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 ',',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                '%2C',  // comma

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         '%2C',  // Comma.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '.',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                '%2E',  // period

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         '%2E',  // Period.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 ';',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                '%3B',  // semicolon

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         '%3B',  // Semicolon.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '{',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                '%7B',  // opening curly bracket

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         '%7B',  // Opening curly bracket.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '}',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                '%7D',  // closing curly bracket

-                               '%E2%80%9C', // opening curly quote

-                               '%E2%80%9D', // closing curly quote

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         '%7D',  // Closing curly bracket.

+                               '%E2%80%9C', // Opening curly quote.

+                               '%E2%80%9D', // Closing curly quote.

</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">@@ -479,22 +487,22 @@

<span class="cx" style="display: block; padding: 0 10px">                // Remove trailing spaces and end punctuation from certain terminating query string args.

</span><span class="cx" style="display: block; padding: 0 10px">                $redirect['query'] = preg_replace( "#((p|page_id|cat|tag)=[^&]*?)($punctuation_pattern)+$#", '$1', $redirect['query'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Clean up empty query strings

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Clean up empty query strings.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $redirect['query'] = trim( preg_replace( '#(^|&)(p|page_id|cat|tag)=?(&|$)#', '&', $redirect['query'] ), '&' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Redirect obsolete feeds

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Redirect obsolete feeds.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $redirect['query'] = preg_replace( '#(^|&)feed=rss(&|$)#', '$1feed=rss2$2', $redirect['query'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Remove redundant leading ampersands

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Remove redundant leading ampersands.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $redirect['query'] = preg_replace( '#^\??&*?#', '', $redirect['query'] );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // strip /index.php/ when we're not using PATHINFO permalinks

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Strip /index.php/ when we're not using PATHINFO permalinks.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! $wp_rewrite->using_index_permalinks() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $redirect['path'] = str_replace( '/' . $wp_rewrite->index . '/', '/', $redirect['path'] );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // trailing slashes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Trailing slashes.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( is_object( $wp_rewrite ) && $wp_rewrite->using_permalinks() && ! is_404() && ( ! is_front_page() || ( is_front_page() && ( get_query_var( 'paged' ) > 1 ) ) ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $user_ts_type = '';

</span><span class="cx" style="display: block; padding: 0 10px">                if ( get_query_var( 'paged' ) > 0 ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -513,18 +521,18 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $redirect['path'] = trailingslashit( $redirect['path'] );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Strip multiple slashes out of the URL

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Strip multiple slashes out of the URL.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( strpos( $redirect['path'], '//' ) > -1 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $redirect['path'] = preg_replace( '|/+|', '/', $redirect['path'] );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Always trailing slash the Front Page URL

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Always trailing slash the Front Page URL.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( trailingslashit( $redirect['path'] ) == trailingslashit( $user_home['path'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $redirect['path'] = trailingslashit( $redirect['path'] );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Ignore differences in host capitalization, as this can lead to infinite redirects

-       // Only redirect no-www <=> yes-www

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Ignore differences in host capitalization, as this can lead to infinite redirects.

+       // Only redirect no-www <=> yes-www.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( strtolower( $original['host'] ) == strtolower( $redirect['host'] ) ||

</span><span class="cx" style="display: block; padding: 0 10px">                ( strtolower( $original['host'] ) != 'www.' . strtolower( $redirect['host'] ) && 'www.' . strtolower( $original['host'] ) != strtolower( $redirect['host'] ) ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $redirect['host'] = $original['host'];

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -596,18 +604,18 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        $redirect_url = apply_filters( 'redirect_canonical', $redirect_url, $requested_url );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // yes, again -- in case the filter aborted the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Yes, again -- in case the filter aborted the request.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! $redirect_url || strip_fragment_from_url( $redirect_url ) == strip_fragment_from_url( $requested_url ) ) {

</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><span class="cx" style="display: block; padding: 0 10px">        if ( $do_redirect ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // protect against chained redirects

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Protect against chained redirects.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! redirect_canonical( $redirect_url, false ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        wp_redirect( $redirect_url, 301 );

</span><span class="cx" style="display: block; padding: 0 10px">                        exit();

</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">-                        // Debug

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Debug.

</ins><span class="cx" style="display: block; padding: 0 10px">                         // die("1: $redirect_url<br />2: " . redirect_canonical( $redirect_url, false ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        return;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -687,7 +695,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        if ( get_query_var( 'name' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $where = $wpdb->prepare( 'post_name LIKE %s', $wpdb->esc_like( get_query_var( 'name' ) ) . '%' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // if any of post_type, year, monthnum, or day are set, use them to refine the query

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If any of post_type, year, monthnum, or day are set, use them to refine the query.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( get_query_var( 'post_type' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $where .= $wpdb->prepare( ' AND post_type = %s', get_query_var( 'post_type' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                } else {

</span></span></pre></div>

<a id="trunksrcwpincludescapabilitiesphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/capabilities.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/capabilities.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/capabilities.php      2020-01-29 00:43:23 UTC (rev 47122)

</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">                        break;

</span><span class="cx" style="display: block; padding: 0 10px">                case 'edit_user':

</span><span class="cx" style="display: block; padding: 0 10px">                case 'edit_users':

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Allow user to edit itself

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Allow user to edit themselves.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( 'edit_user' == $cap && isset( $args[0] ) && $user_id == $args[0] ) {

</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">@@ -137,7 +137,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        break;

</span><span class="cx" style="display: block; padding: 0 10px">                // edit_post breaks down to edit_posts, edit_published_posts, or

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // edit_others_posts

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // edit_others_posts.

</ins><span class="cx" style="display: block; padding: 0 10px">                 case 'edit_post':

</span><span class="cx" style="display: block; padding: 0 10px">                case 'edit_page':

</span><span class="cx" style="display: block; padding: 0 10px">                        $post = get_post( $args[0] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -910,7 +910,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        do_action( 'grant_super_admin', $user_id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Directly fetch site_admins instead of using get_super_admins()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Directly fetch site_admins instead of using get_super_admins().

</ins><span class="cx" style="display: block; padding: 0 10px">         $super_admins = get_site_option( 'site_admins', array( 'admin' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $user = get_userdata( $user_id );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -957,7 +957,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        do_action( 'revoke_super_admin', $user_id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Directly fetch site_admins instead of using get_super_admins()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Directly fetch site_admins instead of using get_super_admins().

</ins><span class="cx" style="display: block; padding: 0 10px">         $super_admins = get_site_option( 'site_admins', array( 'admin' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $user = get_userdata( $user_id );

</span></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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/category-template.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -706,7 +706,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'order'   => 'DESC',

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                )

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        ); // Always query top tags

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ); // Always query top tags.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( empty( $tags ) || is_wp_error( $tags ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                return;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -727,7 +727,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $tags[ $key ]->id   = $tag->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">-        $return = wp_generate_tag_cloud( $tags, $args ); // Here's where those top tags get sorted according to $args

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Here's where those top tags get sorted according to $args.

+       $return = wp_generate_tag_cloud( $tags, $args );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Filters the tag cloud output.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -889,7 +890,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">        $counts      = array();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $real_counts = array(); // For the alt tag

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $real_counts = array(); // For the alt tag.

</ins><span class="cx" style="display: block; padding: 0 10px">         foreach ( (array) $tags as $key => $tag ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $real_counts[ $key ] = $tag->count;

</span><span class="cx" style="display: block; padding: 0 10px">                $counts[ $key ]      = call_user_func( $args['topic_count_scale_callback'], $tag->count );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1053,7 +1054,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">-// Helper functions

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Helper functions.

</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">@@ -1103,7 +1104,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">-// Tags

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Tags.

</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="trunksrcwpincludescategoryphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/category.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/category.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/category.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,7 +36,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        $args['taxonomy'] = apply_filters( 'get_categories_taxonomy', $args['taxonomy'], $args );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Back compat

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Back compat.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( isset( $args['type'] ) && 'link' == $args['type'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                _deprecated_argument(

</span><span class="cx" style="display: block; padding: 0 10px">                        __FUNCTION__,

</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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/class-http.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -943,7 +943,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        return $maybe_relative_path;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check for a scheme on the 'relative' url

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check for a scheme on the 'relative' URL.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! empty( $relative_url_parts['scheme'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return $maybe_relative_path;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -950,8 +950,8 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $absolute_path = $url_parts['scheme'] . '://';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Schemeless URLs will make it this far, so we check for a host in the relative url

-               // and convert it to a protocol-url

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Schemeless URLs will make it this far, so we check for a host in the relative URL

+               // and convert it to a protocol-URL.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( isset( $relative_url_parts['host'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $absolute_path .= $relative_url_parts['host'];

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( isset( $relative_url_parts['port'] ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -964,7 +964,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"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Start off with the Absolute URL path.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Start off with the absolute URL path.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $path = ! empty( $url_parts['path'] ) ? $url_parts['path'] : '/';

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // If it's a root-relative path, then great.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -988,7 +988,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $path = preg_replace( '!^/(\.\./)+!', '', $path );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Add the Query string.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Add the query string.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! empty( $relative_url_parts['query'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $path .= '?' . $relative_url_parts['query'];

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span></span></pre></div>

<a id="trunksrcwpincludesclasswalkernavmenuphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-walker-nav-menu.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-walker-nav-menu.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/class-walker-nav-menu.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -270,4 +270,4 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $output .= "</li>{$n}";

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-} // Walker_Nav_Menu

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+}

</ins></span></pre></div>

<a id="trunksrcwpincludesclasswpadminbarphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-admin-bar.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-admin-bar.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/class-wp-admin-bar.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -122,7 +122,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * }

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function add_node( $args ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Shim for old method signature: add_node( $parent_id, $menu_obj, $args )

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Shim for old method signature: add_node( $parent_id, $menu_obj, $args ).

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( func_num_args() >= 3 && is_string( $args ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $args = array_merge( array( 'parent' => $args ), func_get_arg( 2 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -607,13 +607,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">        public function add_menus() {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // User related, aligned right.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // User-related, aligned right.

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_action( 'admin_bar_menu', 'wp_admin_bar_my_account_menu', 0 );

</span><span class="cx" style="display: block; padding: 0 10px">                add_action( 'admin_bar_menu', 'wp_admin_bar_search_menu', 4 );

</span><span class="cx" style="display: block; padding: 0 10px">                add_action( 'admin_bar_menu', 'wp_admin_bar_my_account_item', 7 );

</span><span class="cx" style="display: block; padding: 0 10px">                add_action( 'admin_bar_menu', 'wp_admin_bar_recovery_mode_menu', 8 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Site related.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Site-related.

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_action( 'admin_bar_menu', 'wp_admin_bar_sidebar_toggle', 0 );

</span><span class="cx" style="display: block; padding: 0 10px">                add_action( 'admin_bar_menu', 'wp_admin_bar_wp_menu', 10 );

</span><span class="cx" style="display: block; padding: 0 10px">                add_action( 'admin_bar_menu', 'wp_admin_bar_my_sites_menu', 20 );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -621,7 +621,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                add_action( 'admin_bar_menu', 'wp_admin_bar_customize_menu', 40 );

</span><span class="cx" style="display: block; padding: 0 10px">                add_action( 'admin_bar_menu', 'wp_admin_bar_updates_menu', 50 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Content related.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Content-related.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! is_network_admin() && ! is_user_admin() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        add_action( 'admin_bar_menu', 'wp_admin_bar_comments_menu', 60 );

</span><span class="cx" style="display: block; padding: 0 10px">                        add_action( 'admin_bar_menu', 'wp_admin_bar_new_content_menu', 70 );

</span></span></pre></div>

<a id="trunksrcwpincludesclasswpajaxresponsephp"></a>

<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-ajax-response.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-ajax-response.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/class-wp-ajax-response.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -129,7 +129,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $action = $_POST['action'];

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">                $x  = '';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $x .= "<response action='{$action}_$id'>"; // The action attribute in the xml output is formatted like a nonce action

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $x .= "<response action='{$action}_$id'>"; // The action attribute in the xml output is formatted like a nonce action.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $x .= "<$what id='$id' " . ( false === $old_id ? '' : "old_id='$old_id' " ) . "position='$position'>";

</span><span class="cx" style="display: block; padding: 0 10px">                $x .= $response;

</span><span class="cx" style="display: block; padding: 0 10px">                $x .= $s;

</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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/class-wp-comment-query.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -292,7 +292,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'meta_key'                  => '',

</span><span class="cx" style="display: block; padding: 0 10px">                        'meta_value'                => '',

</span><span class="cx" style="display: block; padding: 0 10px">                        'meta_query'                => '',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'date_query'                => null, // See WP_Date_Query

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'date_query'                => null, // See WP_Date_Query.

</ins><span class="cx" style="display: block; padding: 0 10px">                         'hierarchical'              => false,

</span><span class="cx" style="display: block; padding: 0 10px">                        'cache_domain'              => 'core',

</span><span class="cx" style="display: block; padding: 0 10px">                        'update_comment_meta_cache' => true,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -360,7 +360,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->parse_query();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Parse meta query

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Parse meta query.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->meta_query = new WP_Meta_Query();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->meta_query->parse_query_vars( $this->query_vars );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -480,7 +480,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                $_comments = apply_filters_ref_array( 'the_comments', array( $_comments, &$this ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Convert to WP_Comment instances

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Convert to WP_Comment instances.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $comments = array_map( 'get_comment', $_comments );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $this->query_vars['hierarchical'] ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -734,7 +734,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        foreach ( $_raw_types as $type ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                switch ( $type ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // An empty translates to 'all', for backward compatibility

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // An empty translates to 'all', for backward compatibility.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         case '':

</span><span class="cx" style="display: block; padding: 0 10px">                                        case 'all':

</span><span class="cx" style="display: block; padding: 0 10px">                                                break;

</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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/class-wp-customize-manager.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -270,7 +270,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $args['changeset_uuid'] = wp_generate_uuid4();

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // The theme and messenger_channel should be supplied via $args, but they are also looked at in the $_REQUEST global here for back-compat.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // The theme and messenger_channel should be supplied via $args,

+               // but they are also looked at in the $_REQUEST global here for back-compat.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! isset( $args['theme'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( isset( $_REQUEST['customize_theme'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $args['theme'] = wp_unslash( $_REQUEST['customize_theme'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -383,7 +384,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                add_action( 'wp_ajax_customize_dismiss_autosave_or_lock', array( $this, 'handle_dismiss_autosave_or_lock_request' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                add_action( 'customize_register', array( $this, 'register_controls' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                add_action( 'customize_register', array( $this, 'register_dynamic_settings' ), 11 ); // allow code to create settings first

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         add_action( 'customize_register', array( $this, 'register_dynamic_settings' ), 11 ); // Allow code to create settings first.

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_action( 'customize_controls_init', array( $this, 'prepare_controls' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                add_action( 'customize_controls_enqueue_scripts', array( $this, 'enqueue_control_scripts' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -504,7 +505,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function setup_theme() {

</span><span class="cx" style="display: block; padding: 0 10px">                global $pagenow;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check permissions for customize.php access since this method is called before customize.php can run any code,

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check permissions for customize.php access since this method is called before customize.php can run any code.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( 'customize.php' === $pagenow && ! current_user_can( 'customize' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! is_user_logged_in() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                auth_redirect();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -563,8 +564,8 @@

<span class="cx" style="display: block; padding: 0 10px">                        // Once the theme is loaded, we'll validate it.

</span><span class="cx" style="display: block; padding: 0 10px">                        add_action( 'after_setup_theme', array( $this, 'after_setup_theme' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                } else {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // If the requested theme is not the active theme and the user doesn't have the

-                       // switch_themes cap, bail.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // If the requested theme is not the active theme and the user doesn't have

+                       // the switch_themes cap, bail.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( ! current_user_can( 'switch_themes' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->wp_die( -1, __( 'Sorry, you are not allowed to edit theme options on this site.' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -898,7 +899,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function wp_loaded() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Unconditionally register core types for panels, sections, and controls in case plugin unhooks all customize_register actions.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Unconditionally register core types for panels, sections, and controls

+               // in case plugin unhooks all customize_register actions.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->register_panel_type( 'WP_Customize_Panel' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->register_panel_type( 'WP_Customize_Themes_Panel' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->register_section_type( 'WP_Customize_Section' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2941,14 +2943,18 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( $args['autosave'] && 'auto-draft' !== get_post_status( $changeset_post_id ) ) {

<span class="cx" style="display: block; padding: 0 10px">                                // See _wp_translate_postdata() for why this is required as it will use the edit_post meta capability.

</span><span class="cx" style="display: block; padding: 0 10px">                                add_filter( 'map_meta_cap', array( $this, 'grant_edit_post_capability_for_changeset' ), 10, 4 );

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $post_array['post_ID']   = $post_array['ID'];

</span><span class="cx" style="display: block; padding: 0 10px">                                $post_array['post_type'] = 'customize_changeset';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $r                       = wp_create_post_autosave( wp_slash( $post_array ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

+                               $r = wp_create_post_autosave( wp_slash( $post_array ) );

+

</ins><span class="cx" style="display: block; padding: 0 10px">                                 remove_filter( 'map_meta_cap', array( $this, 'grant_edit_post_capability_for_changeset' ), 10 );

</span><span class="cx" style="display: block; padding: 0 10px">                        } else {

<span class="cx" style="display: block; padding: 0 10px">                                $post_array['edit_date'] = true; // Prevent date clearing.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $r                       = wp_update_post( wp_slash( $post_array ), true );

</del><span class="cx" style="display: block; padding: 0 10px"> 

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                $r = wp_update_post( wp_slash( $post_array ), true );

+

</ins><span class="cx" style="display: block; padding: 0 10px">                                 // Delete autosave revision for user when the changeset is updated.

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( ! empty( $args['user_id'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        $autosave_draft = wp_get_post_autosave( $changeset_post_id, $args['user_id'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3732,7 +3738,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function add_dynamic_settings( $setting_ids ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $new_settings = array();

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $setting_ids as $setting_id ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Skip settings already created

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Skip settings already created.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( $this->get_setting( $setting_id ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                continue;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5202,8 +5208,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Input type: checkbox

-               // With custom value

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Input type: checkbox.

+               // With custom value.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->add_control(

</span><span class="cx" style="display: block; padding: 0 10px">                        'display_header_text',

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5226,8 +5232,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Input type: Color

-               // With sanitize_callback

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Input type: color.

+               // With sanitize_callback.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->add_setting(

</span><span class="cx" style="display: block; padding: 0 10px">                        'background_color',

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span></span></pre></div>

<a id="trunksrcwpincludesclasswpcustomizesettingphp"></a>

<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-setting.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-setting.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/class-wp-customize-setting.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -861,7 +861,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $create ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! is_array( $node ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // account for an array overriding a string or object value

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Account for an array overriding a string or object value.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $node = array();

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! isset( $node[ $last ] ) ) {

</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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/class-wp-customize-widgets.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -276,11 +276,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'customize_value_old_sidebars_widgets_data', array( $this, 'filter_customize_value_old_sidebars_widgets_data' ) );

<span class="cx" style="display: block; padding: 0 10px">                $this->manager->set_post_value( 'old_sidebars_widgets_data', $this->old_sidebars_widgets ); // Override any value cached in changeset.

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // retrieve_widgets() looks at the global $sidebars_widgets

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // retrieve_widgets() looks at the global $sidebars_widgets.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $sidebars_widgets = $this->old_sidebars_widgets;

</span><span class="cx" style="display: block; padding: 0 10px">                $sidebars_widgets = retrieve_widgets( 'customize' );

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'option_sidebars_widgets', array( $this, 'filter_option_sidebars_widgets_for_theme_switch' ), 1 );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // reset global cache var used by wp_get_sidebars_widgets()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Reset global cache var used by wp_get_sidebars_widgets().

</ins><span class="cx" style="display: block; padding: 0 10px">                 unset( $GLOBALS['_wp_sidebars_widgets'] );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</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">                        $parsed['id_base'] = $matches[1];

</span><span class="cx" style="display: block; padding: 0 10px">                        $parsed['number']  = intval( $matches[2] );

</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">-                        // likely an old single widget

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Likely an old single widget.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $parsed['id_base'] = $widget_id;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">                return $parsed;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -772,7 +772,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $settings = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'registeredSidebars'          => array_values( $wp_registered_sidebars ),

</span><span class="cx" style="display: block; padding: 0 10px">                        'registeredWidgets'           => $wp_registered_widgets,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'availableWidgets'            => $available_widgets, // @todo Merge this with registered_widgets

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'availableWidgets'            => $available_widgets, // @todo Merge this with registered_widgets.

</ins><span class="cx" style="display: block; padding: 0 10px">                         'l10n'                        => array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'saveBtnLabel'     => __( 'Apply' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                'saveBtnTooltip'   => __( 'Save and preview changes before publishing them.' ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -799,7 +799,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 ( $settings['registeredWidgets'] as &$registered_widget ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        unset( $registered_widget['callback'] ); // may not be JSON-serializeable

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 unset( $registered_widget['callback'] ); // May not be JSON-serializeable.

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_scripts->add_data(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -949,7 +949,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">                global $wp_registered_widgets, $wp_registered_widget_controls;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                require_once ABSPATH . 'wp-admin/includes/widgets.php'; // for next_widget_id_number()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         require_once ABSPATH . 'wp-admin/includes/widgets.php'; // For next_widget_id_number().

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $sort = $wp_registered_widgets;

</span><span class="cx" style="display: block; padding: 0 10px">                usort( $sort, array( $this, '_sort_name_callback' ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -956,7 +956,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $done = array();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $sort as $widget ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( in_array( $widget['callback'], $done, true ) ) { // We already showed this multi-widget

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 if ( in_array( $widget['callback'], $done, true ) ) { // We already showed this multi-widget.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 continue;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -968,7 +968,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">                        $available_widget = $widget;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        unset( $available_widget['callback'] ); // not serializable to JSON

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 unset( $available_widget['callback'] ); // Not serializable to JSON.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $args = array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'widget_id'   => $widget['id'],

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1190,7 +1190,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'selectiveRefreshableWidgets' => $this->get_selective_refreshable_widgets(),

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $settings['registeredWidgets'] as &$registered_widget ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        unset( $registered_widget['callback'] ); // may not be JSON-serializeable

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 unset( $registered_widget['callback'] ); // May not be JSON-serializeable.

</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">@@ -1460,7 +1460,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">-                // Clean up any input vars that were manually added

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Clean up any input vars that were manually added.

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $added_input_vars as $key ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        unset( $_POST[ $key ] );

</span><span class="cx" style="display: block; padding: 0 10px">                        unset( $_REQUEST[ $key ] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1873,7 +1873,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">-        // Option Update Capturing

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Option Update Capturing.

</ins><span class="cx" style="display: block; padding: 0 10px">         //

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span></span></pre></div>

<a id="trunksrcwpincludesclasswpdatequeryphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-date-query.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-date-query.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/class-wp-date-query.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -273,7 +273,7 @@

<span class="cx" style="display: block; padding: 0 10px">         * continue (though of course no items will be found for impossible dates).

<span class="cx" style="display: block; padding: 0 10px">         * This method only generates debug notices for these cases.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since  4.1.0

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @since 4.1.0

</ins><span class="cx" style="display: block; padding: 0 10px">          *

<span class="cx" style="display: block; padding: 0 10px">         * @param  array $date_query The date_query array.

<span class="cx" style="display: block; padding: 0 10px">         * @return bool  True if all values in the query are valid, false if one or more fail.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -315,7 +315,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $max_days_of_year = gmdate( 'z', mktime( 0, 0, 0, 12, 31, $_year ) ) + 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">-                        // otherwise we use the max of 366 (leap-year)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Otherwise we use the max of 366 (leap-year).

</ins><span class="cx" style="display: block; padding: 0 10px">                         $max_days_of_year = 366;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -675,7 +675,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * A wrapper for get_sql_for_clause(), included here for backward

<span class="cx" style="display: block; padding: 0 10px">         * compatibility while retaining the naming convention across Query classes.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since  3.7.0

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @since 3.7.0

</ins><span class="cx" style="display: block; padding: 0 10px">          *

<span class="cx" style="display: block; padding: 0 10px">         * @param  array $query Date query arguments.

</span><span class="cx" style="display: block; padding: 0 10px">         * @return array {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -692,7 +692,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Turns a first-order date query into SQL for a WHERE clause.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since  4.1.0

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @since 4.1.0

</ins><span class="cx" style="display: block; padding: 0 10px">          *

<span class="cx" style="display: block; padding: 0 10px">         * @param  array $query        Date query clause.

<span class="cx" style="display: block; padding: 0 10px">         * @param  array $parent_query Parent query of the current date query.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -745,7 +745,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'WEEKDAY'        => array( 'dayofweek_iso' ),

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check of the possible date units and add them to the query

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check of the possible date units and add them to the query.

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $date_units as $sql_part => $query_parts ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        foreach ( $query_parts as $query_part ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( isset( $query[ $query_part ] ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -966,12 +966,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function build_time_query( $column, $compare, $hour = null, $minute = null, $second = null ) {

</span><span class="cx" style="display: block; padding: 0 10px">                global $wpdb;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Have to have at least one

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Have to have at least one.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! isset( $hour ) && ! isset( $minute ) && ! isset( $second ) ) {

</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">-                // Complex combined queries aren't supported for multi-value queries

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Complex combined queries aren't supported for multi-value queries.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( in_array( $compare, array( 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN' ) ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $return = array();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -993,7 +993,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        return implode( ' AND ', $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">-                // Cases where just one unit is set

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Cases where just one unit is set.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( isset( $hour ) && ! isset( $minute ) && ! isset( $second ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $value = $this->build_value( $compare, $hour );

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( false !== $value ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1019,7 +1019,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $format = '';

</span><span class="cx" style="display: block; padding: 0 10px">                $time   = '';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Hour

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Hour.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( null !== $hour ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $format .= '%H.';

</span><span class="cx" style="display: block; padding: 0 10px">                        $time   .= sprintf( '%02d', $hour ) . '.';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1028,7 +1028,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $time   .= '0.';

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Minute

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Minute.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $format .= '%i';

</span><span class="cx" style="display: block; padding: 0 10px">                $time   .= sprintf( '%02d', $minute );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunksrcwpincludesclasswpeditorphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-editor.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-editor.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/class-wp-editor.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -293,7 +293,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        remove_filter( 'the_editor_content', 'format_for_editor' );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Back-compat for the `htmledit_pre` and `richedit_pre` filters

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Back-compat for the `htmledit_pre` and `richedit_pre` filters.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( 'html' === $default_editor && has_filter( 'htmledit_pre' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        /** This filter is documented in wp-includes/deprecated.php */

</span><span class="cx" style="display: block; padding: 0 10px">                        $content = apply_filters_deprecated( 'htmledit_pre', array( $content ), '4.3.0', 'format_for_editor' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -514,7 +514,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                                        $plugurl                       = dirname( $url );

</span><span class="cx" style="display: block; padding: 0 10px">                                                        $strings                       = '';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                        // Try to load langs/[locale].js and langs/[locale]_dlg.js

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 // Try to load langs/[locale].js and langs/[locale]_dlg.js.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                         if ( ! in_array( $name, $loaded_langs, true ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                                $path = str_replace( content_url(), '', $plugurl );

</span><span class="cx" style="display: block; padding: 0 10px">                                                                $path = WP_CONTENT_DIR . $path . '/langs/';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -568,9 +568,11 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                $mce_css = $settings['content_css'];

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // The `editor-style.css` added by the theme is generally intended for the editor instance on the Edit Post screen.

-                               // Plugins that use wp_editor() on the front-end can decide whether to add the theme stylesheet

-                               // by using `get_editor_stylesheets()` and the `mce_css` or `tiny_mce_before_init` filters, see below.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         /*

+                                * The `editor-style.css` added by the theme is generally intended for the editor instance on the Edit Post screen.

+                                * Plugins that use wp_editor() on the front-end can decide whether to add the theme stylesheet

+                                * by using `get_editor_stylesheets()` and the `mce_css` or `tiny_mce_before_init` filters, see below.

+                                */

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( is_admin() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        $editor_styles = get_editor_stylesheets();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -771,7 +773,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'body_class'        => $body_class,

</span><span class="cx" style="display: block; padding: 0 10px">                        );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Merge with the first part of the init array

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Merge with the first part of the init array.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $mceInit = array_merge( self::$first_init, $mceInit );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( is_array( $set['tinymce'] ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -819,7 +821,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        self::$mce_settings[ $editor_id ] = $mceInit;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                } // end if self::$this_tinymce

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         } // End if self::$this_tinymce.

</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">@@ -913,7 +915,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                self::enqueue_scripts( 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">-                // Also add wp-includes/css/editor.css

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Also add wp-includes/css/editor.css.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_enqueue_style( 'editor-buttons' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( is_admin() ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -946,9 +948,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                $settings['directionality'] = 'rtl';

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // In production all plugins are loaded (they are in wp-editor.js.gz).

-                       // The 'wpview', 'wpdialogs', and 'media' TinyMCE plugins are not initialized by default.

-                       // Can be added from js by using the 'wp-before-tinymce-init' event.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 /*

+                        * In production all plugins are loaded (they are in wp-editor.js.gz).

+                        * The 'wpview', 'wpdialogs', and 'media' TinyMCE plugins are not initialized by default.

+                        * Can be added from js by using the 'wp-before-tinymce-init' event.

+                        */

</ins><span class="cx" style="display: block; padding: 0 10px">                         $settings['plugins'] = implode(

</span><span class="cx" style="display: block; padding: 0 10px">                                ',',

</span><span class="cx" style="display: block; padding: 0 10px">                                array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1033,7 +1037,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public static function get_mce_locale() {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( empty( self::$mce_locale ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $mce_locale       = get_user_locale();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        self::$mce_locale = empty( $mce_locale ) ? 'en' : strtolower( substr( $mce_locale, 0, 2 ) ); // ISO 639-1

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 self::$mce_locale = empty( $mce_locale ) ? 'en' : strtolower( substr( $mce_locale, 0, 2 ) ); // ISO 639-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">                return self::$mce_locale;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1107,7 +1111,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'menubar'                      => false,

</span><span class="cx" style="display: block; padding: 0 10px">                        'branding'                     => 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">-                        // Limit the preview styles in the menu/toolbar

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Limit the preview styles in the menu/toolbar.

</ins><span class="cx" style="display: block; padding: 0 10px">                         'preview_styles'               => 'font-family font-size font-weight font-style text-decoration text-transform',

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        'end_container_on_empty_block' => true,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1120,7 +1124,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $suffix  = SCRIPT_DEBUG ? '' : '.min';

</span><span class="cx" style="display: block; padding: 0 10px">                $version = 'ver=' . get_bloginfo( '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">-                // Default stylesheets

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Default stylesheets.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $settings['content_css'] = includes_url( "css/dashicons$suffix.css?$version" ) . ',' .

</span><span class="cx" style="display: block; padding: 0 10px">                        includes_url( "js/tinymce/skins/wordpress/wp-content.css?$version" );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1135,7 +1139,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        private static function get_translation() {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( empty( self::$translation ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        self::$translation = array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Default TinyMCE strings

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Default TinyMCE strings.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'New document'                         => __( 'New document' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                'Formats'                              => _x( 'Formats', 'TinyMCE' ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1200,7 +1204,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'Upper Roman'                          => _x( 'Upper Roman', 'list style' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                'Lower Roman'                          => _x( 'Lower Roman', 'list style' ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Anchor plugin

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Anchor plugin.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'Name'                                 => _x( 'Name', 'Name of link anchor (TinyMCE)' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                'Anchor'                               => _x( 'Anchor', 'Link anchor (TinyMCE)' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                'Anchors'                              => _x( 'Anchors', 'Link anchors (TinyMCE)' ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1208,7 +1212,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        __( 'Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                'Id'                                   => _x( 'Id', 'Id for link anchor (TinyMCE)' ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Fullpage plugin

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Fullpage plugin.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'Document properties'                  => __( 'Document properties' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                'Robots'                               => __( 'Robots' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                'Title'                                => __( 'Title' ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1217,7 +1221,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'Description'                          => __( 'Description' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                'Author'                               => __( 'Author' ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Media, image plugins

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Media, image plugins.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'Image'                                => __( 'Image' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                'Insert/edit image'                    => array( __( 'Insert/edit image' ), 'accessM' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                'General'                              => __( 'General' ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1243,7 +1247,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'Insert video'                         => __( 'Insert video' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                'Embed'                                => __( 'Embed' ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Each of these have a corresponding plugin

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Each of these have a corresponding plugin.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'Special character'                    => __( 'Special character' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                'Right to left'                        => _x( 'Right to left', 'editor button' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                'Left to right'                        => _x( 'Left to right', 'editor button' ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1261,7 +1265,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'Insert/edit link'                     => array( __( 'Insert/edit link' ), 'metaK' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                'Remove link'                          => array( __( 'Remove link' ), 'accessS' ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Link plugin

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Link plugin.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'Link'                                 => __( 'Link' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                'Insert link'                          => __( 'Insert link' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                'Target'                               => __( 'Target' ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1275,13 +1279,13 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                'Color'                                => __( 'Color' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                'Custom color'                         => __( 'Custom color' ),

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                'Custom...'                            => _x( 'Custom...', 'label for custom color' ), // no ellipsis

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         'Custom...'                            => _x( 'Custom...', 'label for custom color' ), // No ellipsis.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'No color'                             => __( 'No color' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                'R'                                    => _x( 'R', 'Short for red in RGB' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                'G'                                    => _x( 'G', 'Short for green in RGB' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                'B'                                    => _x( 'B', 'Short for blue in RGB' ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Spelling, search/replace plugins

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Spelling, search/replace plugins.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'Could not find the specified string.' => __( 'Could not find the specified string.' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                'Replace'                              => _x( 'Replace', 'find/replace' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                'Next'                                 => _x( 'Next', 'find/replace' ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1299,7 +1303,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'Ignore'                               => _x( 'Ignore', 'spellcheck' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                'Add to Dictionary'                    => __( 'Add to Dictionary' ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // TinyMCE tables

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // TinyMCE tables.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'Insert table'                         => __( 'Insert table' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                'Delete table'                         => __( 'Delete table' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                'Table properties'                     => __( 'Table properties' ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1373,7 +1377,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'Your browser doesn\'t support direct access to the clipboard. Please use the Ctrl+X/C/V keyboard shortcuts instead.' =>

</span><span class="cx" style="display: block; padding: 0 10px">                                        __( 'Your browser does not support direct access to the clipboard. Please use keyboard shortcuts or your browser&#8217;s edit menu instead.' ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // TinyMCE menus

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // TinyMCE menus.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'Insert'                               => _x( 'Insert', 'TinyMCE menu' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                'File'                                 => _x( 'File', 'TinyMCE menu' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                'Edit'                                 => _x( 'Edit', 'TinyMCE menu' ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1382,23 +1386,23 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'Table'                                => _x( 'Table', 'TinyMCE menu' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                'Format'                               => _x( 'Format', 'TinyMCE menu' ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // WordPress strings

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // WordPress strings.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'Toolbar Toggle'                       => array( __( 'Toolbar Toggle' ), 'accessZ' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                'Insert Read More tag'                 => array( __( 'Insert Read More tag' ), 'accessT' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                'Insert Page Break tag'                => array( __( 'Insert Page Break tag' ), 'accessP' ),

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                'Read more...'                         => __( 'Read more...' ), // Title on the placeholder inside the editor (no ellipsis)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         'Read more...'                         => __( 'Read more...' ), // Title on the placeholder inside the editor (no ellipsis).

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'Distraction-free writing mode'        => array( __( 'Distraction-free writing mode' ), 'accessW' ),

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                'No alignment'                         => __( 'No alignment' ), // Tooltip for the 'alignnone' button in the image toolbar

-                               'Remove'                               => __( 'Remove' ), // Tooltip for the 'remove' button in the image toolbar

-                               'Edit|button'                          => __( 'Edit' ), // Tooltip for the 'edit' button in the image toolbar

-                               'Paste URL or type to search'          => __( 'Paste URL or type to search' ), // Placeholder for the inline link dialog

-                               'Apply'                                => __( 'Apply' ), // Tooltip for the 'apply' button in the inline link dialog

-                               'Link options'                         => __( 'Link options' ), // Tooltip for the 'link options' button in the inline link dialog

-                               'Visual'                               => _x( 'Visual', 'Name for the Visual editor tab' ), // Editor switch tab label

-                               'Text'                                 => _x( 'Text', 'Name for the Text editor tab (formerly HTML)' ), // Editor switch tab label

-                               'Add Media'                            => array( __( 'Add Media' ), 'accessM' ), // Tooltip for the 'Add Media' button in the block editor Classic block

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         'No alignment'                         => __( 'No alignment' ), // Tooltip for the 'alignnone' button in the image toolbar.

+                               'Remove'                               => __( 'Remove' ),       // Tooltip for the 'remove' button in the image toolbar.

+                               'Edit|button'                          => __( 'Edit' ),         // Tooltip for the 'edit' button in the image toolbar.

+                               'Paste URL or type to search'          => __( 'Paste URL or type to search' ), // Placeholder for the inline link dialog.

+                               'Apply'                                => __( 'Apply' ),        // Tooltip for the 'apply' button in the inline link dialog.

+                               'Link options'                         => __( 'Link options' ), // Tooltip for the 'link options' button in the inline link dialog.

+                               'Visual'                               => _x( 'Visual', 'Name for the Visual editor tab' ),             // Editor switch tab label.

+                               'Text'                                 => _x( 'Text', 'Name for the Text editor tab (formerly HTML)' ), // Editor switch tab label.

+                               'Add Media'                            => array( __( 'Add Media' ), 'accessM' ), // Tooltip for the 'Add Media' button in the block editor Classic block.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Shortcuts help modal

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Shortcuts help modal.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'Keyboard Shortcuts'                   => array( __( 'Keyboard Shortcuts' ), 'accessH' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                'Classic Block Keyboard Shortcuts'     => __( 'Classic Block Keyboard Shortcuts' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                'Default shortcuts,'                   => __( 'Default shortcuts,' ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1496,7 +1500,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">-                // Set direction

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set direction.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( is_rtl() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $mce_translation['_dir'] = 'rtl';

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1643,7 +1647,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        self::print_tinymce_scripts();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( self::$ext_plugins ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Load the old-format English strings to prevent unsightly labels in old style popups

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Load the old-format English strings to prevent unsightly labels in old style popups.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 echo "<script type='text/javascript' src='{$baseurl}/langs/wp-langs-en.js?$version'></script>\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">@@ -1828,7 +1832,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">        public static function wp_link_dialog() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Run once

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Run once.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( self::$link_dialog_printed ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1835,7 +1839,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                self::$link_dialog_printed = 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">-                // display: none is required here, see #WP27605

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // `display: none` is required here, see #WP27605.

</ins><span class="cx" style="display: block; padding: 0 10px">                 ?>

</span><span class="cx" style="display: block; padding: 0 10px">                <div id="wp-link-backdrop" style="display: none"></div>

</span><span class="cx" style="display: block; padding: 0 10px">                <div id="wp-link-wrap" class="wp-core-ui" style="display: none" role="dialog" aria-labelledby="link-modal-title">

</span></span></pre></div>

<a id="trunksrcwpincludesclasswpembedphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-embed.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-embed.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/class-wp-embed.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,18 +28,18 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * Constructor

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function __construct() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Hack to get the [embed] shortcode to run before wpautop()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Hack to get the [embed] shortcode to run before wpautop().

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_filter( 'the_content', array( $this, 'run_shortcode' ), 8 );

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'widget_text_content', array( $this, 'run_shortcode' ), 8 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Shortcode placeholder for strip_shortcodes()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Shortcode placeholder for strip_shortcodes().

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_shortcode( 'embed', '__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">-                // Attempts to embed all URLs in a post

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Attempts to embed all URLs in a post.

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_filter( 'the_content', array( $this, 'autoembed' ), 8 );

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'widget_text_content', array( $this, 'autoembed' ), 8 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // After a post is saved, cache oEmbed items via Ajax

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // After a post is saved, cache oEmbed items via Ajax.

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_action( 'edit_form_advanced', array( $this, 'maybe_run_ajax_cache' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                add_action( 'edit_page_form', array( $this, 'maybe_run_ajax_cache' ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -59,16 +59,16 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function run_shortcode( $content ) {

</span><span class="cx" style="display: block; padding: 0 10px">                global $shortcode_tags;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Back up current registered shortcodes and clear them all out

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Back up current registered shortcodes and clear them all out.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $orig_shortcode_tags = $shortcode_tags;

</span><span class="cx" style="display: block; padding: 0 10px">                remove_all_shortcodes();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                add_shortcode( 'embed', array( $this, 'shortcode' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Do the shortcode (only the [embed] one is registered)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Do the shortcode (only the [embed] one is registered).

</ins><span class="cx" style="display: block; padding: 0 10px">                 $content = do_shortcode( $content, 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">-                // Put the original shortcodes back

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Put the original shortcodes back.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $shortcode_tags = $orig_shortcode_tags;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                return $content;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -161,11 +161,11 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->last_attr = $attr;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // kses converts & into &amp; and we need to undo this

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // KSES converts & into &amp; and we need to undo this.

</ins><span class="cx" style="display: block; padding: 0 10px">                 // See https://core.trac.wordpress.org/ticket/11311

</span><span class="cx" style="display: block; padding: 0 10px">                $url = str_replace( '&amp;', '&', $url );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Look for known internal handlers

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Look for known internal handlers.

</ins><span class="cx" style="display: block; padding: 0 10px">                 ksort( $this->handlers );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $this->handlers as $priority => $handlers ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        foreach ( $handlers as $id => $handler ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -339,7 +339,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        return apply_filters( 'embed_oembed_html', $html, $url, $attr, $post_ID );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Still unknown

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Still unknown.

</ins><span class="cx" style="display: block; padding: 0 10px">                 return $this->maybe_make_link( $url );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -381,7 +381,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">-                // Trigger a caching

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Trigger a caching.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! empty( $post->post_content ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->post_ID  = $post->ID;

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->usecache = false;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -486,7 +486,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( $oembed_post_query->posts ) ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Note: 'fields'=>'ids' is not being used in order to cache the post object as it will be needed.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Note: 'fields' => 'ids' is not being used in order to cache the post object as it will be needed.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $oembed_post_id = $oembed_post_query->posts[0]->ID;

</span><span class="cx" style="display: block; padding: 0 10px">                        wp_cache_set( $cache_key, $oembed_post_id, $cache_group );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunksrcwpincludesclasswpfatalerrorhandlerphp"></a>

<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-fatal-error-handler.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-fatal-error-handler.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/class-wp-fatal-error-handler.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,7 +3,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">  * Error Protection API: WP_Fatal_Error_Handler class

</span><span class="cx" style="display: block; padding: 0 10px">  *

</span><span class="cx" style="display: block; padding: 0 10px">  * @package WordPress

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since   5.2.0

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.2.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="trunksrcwpincludesclasswphookphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-hook.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-hook.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/class-wp-hook.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,7 +80,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'accepted_args' => $accepted_args,

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // if we're adding a new priority to the list, put them back in sorted order

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If we're adding a new priority to the list, put them back in sorted order.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! $priority_existed && count( $this->callbacks ) > 1 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        ksort( $this->callbacks, SORT_NUMERIC );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -135,7 +135,7 @@

<span class="cx" style="display: block; padding: 0 10px">                        // If we have a new priority that didn't exist, but ::apply_filters() or ::do_action() thinks it's the current priority...

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( $new_priority === $this->current_priority[ $index ] && ! $priority_existed ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                /*

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                 * ... and the new priority is the same as what $this->iterations thinks is the previous

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                          * ...and the new priority is the same as what $this->iterations thinks is the previous

</ins><span class="cx" style="display: block; padding: 0 10px">                                  * priority, we need to move back to it.

</span><span class="cx" style="display: block; padding: 0 10px">                                 */

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -280,7 +280,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        $args[0] = $value;

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Avoid the array_slice if possible.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Avoid the array_slice() if possible.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( $the_['accepted_args'] == 0 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        $value = call_user_func( $the_['function'] );

</span><span class="cx" style="display: block; padding: 0 10px">                                } elseif ( $the_['accepted_args'] >= $num_args ) {

</span></span></pre></div>

<a id="trunksrcwpincludesclasswphttpixrclientphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-http-ixr-client.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-http-ixr-client.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/class-wp-http-ixr-client.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,7 +20,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function __construct( $server, $path = false, $port = false, $timeout = 15 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! $path ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Assume we have been given a URL instead

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Assume we have been given a URL instead.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $bits         = parse_url( $server );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->scheme = $bits['scheme'];

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->server = $bits['host'];

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,7 +27,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->port   = isset( $bits['port'] ) ? $bits['port'] : $port;

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->path   = ! empty( $bits['path'] ) ? $bits['path'] : '/';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Make absolutely sure we have a path

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Make absolutely sure we have a path.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( ! $this->path ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->path = '/';

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,7 +62,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'body'       => $xml,

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Merge Custom headers ala #8145

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Merge Custom headers ala #8145.

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $this->headers as $header => $value ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $args['headers'][ $header ] = $value;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,7 +80,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $args['timeout'] = $this->timeout;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Now send the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Now send the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $this->debug ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        echo '<pre class="ixr_request">' . htmlspecialchars( $xml ) . "\n</pre>\n\n";

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -103,10 +103,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        echo '<pre class="ixr_response">' . htmlspecialchars( wp_remote_retrieve_body( $response ) ) . "\n</pre>\n\n";

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Now parse what we've got back

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Now parse what we've got back.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->message = new IXR_Message( wp_remote_retrieve_body( $response ) );

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! $this->message->parse() ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // XML error

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // XML error.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->error = new IXR_Error( -32700, 'parse error. not well formed' );

</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">@@ -117,7 +117,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">-                // Message must be OK

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Message must be OK.

</ins><span class="cx" style="display: block; padding: 0 10px">                 return true;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span></span></pre></div>

<a id="trunksrcwpincludesclasswphttprequestshooksphp"></a>

<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-requests-hooks.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-http-requests-hooks.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/class-wp-http-requests-hooks.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,7 +50,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function dispatch( $hook, $parameters = array() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $result = parent::dispatch( $hook, $parameters );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Handle back-compat actions

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Handle back-compat actions.

</ins><span class="cx" style="display: block; padding: 0 10px">                 switch ( $hook ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        case 'curl.before_send':

</span><span class="cx" style="display: block; padding: 0 10px">                                /** This action is documented in wp-includes/class-wp-http-curl.php */

</span></span></pre></div>

<a id="trunksrcwpincludesclasswphttpstreamsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-http-streams.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-http-streams.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/class-wp-http-streams.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,7 +65,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Always pass a Path, defaulting to the root in cases such as http://example.com

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Always pass a path, defaulting to the root in cases such as http://example.com.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! isset( $arrURL['path'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $arrURL['path'] = '/';

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -114,7 +114,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'ssl' => array(

</span><span class="cx" style="display: block; padding: 0 10px">                                        'verify_peer'       => $ssl_verify,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        //'CN_match' => $arrURL['host'], // This is handled by self::verify_ssl_certificate()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // 'CN_match' => $arrURL['host'], // This is handled by self::verify_ssl_certificate().

</ins><span class="cx" style="display: block; padding: 0 10px">                                         'capture_peer_cert' => $ssl_verify,

</span><span class="cx" style="display: block; padding: 0 10px">                                        'SNI_enabled'       => true,

</span><span class="cx" style="display: block; padding: 0 10px">                                        'cafile'            => $parsed_args['sslcertificates'],

</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">                $connection_error_str = null;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! WP_DEBUG ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // In the event that the SSL connection fails, silence the many PHP Warnings.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // In the event that the SSL connection fails, silence the many PHP warnings.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( $secure_transport ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $error_reporting = error_reporting( 0 );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -176,7 +176,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                stream_set_timeout( $handle, $timeout, $utimeout );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) ) { //Some proxies require full URL in this field.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) ) { // Some proxies require full URL in this field.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $requestPath = $url;

</span><span class="cx" style="display: block; padding: 0 10px">                } else {

</span><span class="cx" style="display: block; padding: 0 10px">                        $requestPath = $arrURL['path'] . ( isset( $arrURL['query'] ) ? '?' . $arrURL['query'] : '' );

</span></span></pre></div>

<a id="trunksrcwpincludesclasswpimageeditorgdphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-image-editor-gd.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-image-editor-gd.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/class-wp-image-editor-gd.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,7 +23,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        public function __destruct() {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $this->image ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // we don't need the original in memory anymore

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // We don't need the original in memory anymore.

</ins><span class="cx" style="display: block; padding: 0 10px">                         imagedestroy( $this->image );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,7 +41,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">-                // On some setups GD library does not provide imagerotate() - Ticket #11536

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // On some setups GD library does not provide imagerotate() - Ticket #11536.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( isset( $args['methods'] ) &&

</span><span class="cx" style="display: block; padding: 0 10px">                        in_array( 'rotate', $args['methods'], true ) &&

</span><span class="cx" style="display: block; padding: 0 10px">                        ! function_exists( 'imagerotate' ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -307,8 +307,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @return bool|WP_Error

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function crop( $src_x, $src_y, $src_w, $src_h, $dst_w = null, $dst_h = null, $src_abs = false ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If destination width/height isn't specified, use same as

-               // width/height from source.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If destination width/height isn't specified,

+               // use same as width/height from source.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! $dst_w ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $dst_w = $src_w;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -432,7 +432,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                return new WP_Error( 'image_save_error', __( 'Image Editor Save Failed' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                } elseif ( 'image/png' === $mime_type ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // convert from full colors to index colors, like original PNG.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Convert from full colors to index colors, like original PNG.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( function_exists( 'imageistruecolor' ) && ! imageistruecolor( $image ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                imagetruecolortopalette( $image, false, imagecolorstotal( $image ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -448,9 +448,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        return new WP_Error( 'image_save_error', __( 'Image Editor Save Failed' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set correct file permissions

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set correct file permissions.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $stat  = stat( dirname( $filename ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $perms = $stat['mode'] & 0000666; //same permissions as parent folder, strip off the executable bits

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $perms = $stat['mode'] & 0000666; // Same permissions as parent folder, strip off the executable bits.

</ins><span class="cx" style="display: block; padding: 0 10px">                 chmod( $filename, $perms );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                /**

</span></span></pre></div>

<a id="trunksrcwpincludesclasswpimageeditorimagickphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-image-editor-imagick.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-image-editor-imagick.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/class-wp-image-editor-imagick.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,7 +23,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        public function __destruct() {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $this->image instanceof Imagick ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // we don't need the original in memory anymore

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // We don't need the original in memory anymore.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->image->clear();

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->image->destroy();

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -154,7 +154,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                return new WP_Error( 'invalid_image', __( 'File is not an image.' ), $this->file );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Select the first frame to handle animated images properly

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Select the first frame to handle animated images properly.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( is_callable( array( $this->image, 'setIteratorIndex' ) ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->image->setIteratorIndex( 0 );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -263,7 +263,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        return $this->crop( $src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Execute the resize

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Execute the resize.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $thumb_result = $this->thumbnail_image( $dst_w, $dst_h );

</span><span class="cx" style="display: block; padding: 0 10px">                if ( is_wp_error( $thumb_result ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return $thumb_result;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -530,8 +530,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->image->setImagePage( $src_w, $src_h, 0, 0 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( $dst_w || $dst_h ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // If destination width/height isn't specified, use same as

-                               // width/height from source.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // If destination width/height isn't specified,

+                               // use same as width/height from source.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( ! $dst_w ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        $dst_w = $src_w;

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -675,21 +675,21 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                try {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Store initial Format

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Store initial format.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $orig_format = $this->image->getImageFormat();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->image->setImageFormat( strtoupper( $this->get_extension( $mime_type ) ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->make_image( $filename, array( $image, 'writeImage' ), array( $filename ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Reset original Format

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Reset original format.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->image->setImageFormat( $orig_format );

</span><span class="cx" style="display: block; padding: 0 10px">                } catch ( Exception $e ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return new WP_Error( 'image_save_error', $e->getMessage(), $filename );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set correct file permissions

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set correct file permissions.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $stat  = stat( dirname( $filename ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $perms = $stat['mode'] & 0000666; //same permissions as parent folder, strip off the executable bits

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $perms = $stat['mode'] & 0000666; // Same permissions as parent folder, strip off the executable bits.

</ins><span class="cx" style="display: block; padding: 0 10px">                 chmod( $filename, $perms );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                return array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -714,14 +714,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">                list( $filename, $extension, $mime_type ) = $this->get_output_format( null, $mime_type );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                try {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Temporarily change format for stream

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Temporarily change format for stream.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->image->setImageFormat( strtoupper( $extension ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Output stream of image content

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Output stream of image content.

</ins><span class="cx" style="display: block; padding: 0 10px">                         header( "Content-Type: $mime_type" );

</span><span class="cx" style="display: block; padding: 0 10px">                        print $this->image->getImageBlob();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Reset Image to original Format

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Reset image to original format.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->image->setImageFormat( $this->get_extension( $this->mime_type ) );

</span><span class="cx" style="display: block; padding: 0 10px">                } catch ( Exception $e ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return new WP_Error( 'image_stream_error', $e->getMessage() );

</span></span></pre></div>

<a id="trunksrcwpincludesclasswpimageeditorphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-image-editor.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-image-editor.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/class-wp-image-editor.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -295,7 +295,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        protected function get_output_format( $filename = null, $mime_type = null ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $new_ext = null;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // By default, assume specified type takes priority

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // By default, assume specified type takes priority.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $mime_type ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $new_ext = $this->get_extension( $mime_type );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -310,7 +310,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                // Check to see if specified mime-type is the same as type implied by

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // file extension.  If so, prefer extension from file.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // file extension. If so, prefer extension from file.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! $mime_type || ( $file_mime == $mime_type ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $mime_type = $file_mime;

</span><span class="cx" style="display: block; padding: 0 10px">                        $new_ext   = $file_ext;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -353,7 +353,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @return string filename

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function generate_filename( $suffix = null, $dest_path = null, $extension = null ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // $suffix will be appended to the destination filename, just before the extension

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // $suffix will be appended to the destination filename, just before the extension.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! $suffix ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $suffix = $this->get_suffix();

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -429,7 +429,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                break;

</span><span class="cx" style="display: block; padding: 0 10px">                        case 3:

<span class="cx" style="display: block; padding: 0 10px">                                // Rotate 180 degrees or flip horizontally and vertically.

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Flipping seems faster/uses less resources.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Flipping seems faster and uses less resources.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $result = $this->flip( true, true );

</span><span class="cx" style="display: block; padding: 0 10px">                                break;

</span><span class="cx" style="display: block; padding: 0 10px">                        case 4:

</span></span></pre></div>

<a id="trunksrcwpincludesclasswplocalephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-locale.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-locale.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/class-wp-locale.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -118,7 +118,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @global string $wp_version

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function init() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // The Weekdays

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // The weekdays.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->weekday[0] = /* translators: Weekday. */ __( 'Sunday' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->weekday[1] = /* translators: Weekday. */ __( 'Monday' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->weekday[2] = /* translators: Weekday. */ __( 'Tuesday' );

</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">                $this->weekday_abbrev[ __( 'Friday' ) ]    = /* translators: Three-letter abbreviation of the weekday. */ __( 'Fri' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->weekday_abbrev[ __( 'Saturday' ) ]  = /* translators: Three-letter abbreviation of the weekday. */ __( 'Sat' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // The Months

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // The months.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->month['01'] = /* translators: Month name. */ __( 'January' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->month['02'] = /* translators: Month name. */ __( 'February' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->month['03'] = /* translators: Month name. */ __( 'March' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -159,7 +159,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->month['11'] = /* translators: Month name. */ __( 'November' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->month['12'] = /* translators: Month name. */ __( 'December' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // The Months, genitive

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // The months, genitive.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->month_genitive['01'] = /* translators: Month name, genitive. */ _x( 'January', 'genitive' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->month_genitive['02'] = /* translators: Month name, genitive. */ _x( 'February', 'genitive' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->month_genitive['03'] = /* translators: Month name, genitive. */ _x( 'March', 'genitive' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -187,13 +187,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->month_abbrev[ __( 'November' ) ]  = /* translators: Three-letter abbreviation of the month. */ _x( 'Nov', 'November abbreviation' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->month_abbrev[ __( 'December' ) ]  = /* translators: Three-letter abbreviation of the month. */ _x( 'Dec', 'December abbreviation' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // The Meridiems

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // The meridiems.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->meridiem['am'] = __( 'am' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->meridiem['pm'] = __( 'pm' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->meridiem['AM'] = __( 'AM' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->meridiem['PM'] = __( 'PM' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Numbers formatting

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Numbers formatting.

</ins><span class="cx" style="display: block; padding: 0 10px">                 // See https://www.php.net/number_format

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                /* translators: $thousands_sep argument for https://www.php.net/number_format, default is ',' */

</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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/class-wp-matchesmapregex.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,7 +38,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @var string

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        public $_pattern = '(\$matches\[[1-9]+[0-9]*\])'; // magic number

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public $_pattern = '(\$matches\[[1-9]+[0-9]*\])'; // Magic 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">         * constructor

</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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/class-wp-network-query.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -290,7 +290,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                $_networks = apply_filters_ref_array( 'the_networks', array( $_networks, &$this ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Convert to WP_Network instances

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Convert to WP_Network instances.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->networks = array_map( 'get_network', $_networks );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                return $this->networks;

</span></span></pre></div>

<a id="trunksrcwpincludesclasswpnetworkphp"></a>

<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.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-network.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/class-wp-network.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -243,7 +243,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                return (int) $this->blog_id;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( defined( 'BLOGID_CURRENT_SITE' ) ) { // deprecated.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 if ( defined( 'BLOGID_CURRENT_SITE' ) ) { // Deprecated.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $this->blog_id = (string) BLOGID_CURRENT_SITE;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                return (int) $this->blog_id;

</span></span></pre></div>

<a id="trunksrcwpincludesclasswpoembedphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-oembed.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-oembed.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/class-wp-oembed.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -262,7 +262,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $this->providers as $matchmask => $data ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        list( $providerurl, $regex ) = $data;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Turn the asterisk-type provider URLs into regex

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Turn the asterisk-type provider URLs into regex.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( ! $regex ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $matchmask = '#' . str_replace( '___wildcard___', '(.+)', preg_quote( str_replace( '*', '___wildcard___', $matchmask ), '#' ) ) . '#i';

</span><span class="cx" style="display: block; padding: 0 10px">                                $matchmask = preg_replace( '|^#http\\\://|', '#https?\://', $matchmask );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -269,7 +269,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 ( preg_match( $matchmask, $url ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $provider = str_replace( '{format}', 'json', $providerurl ); // JSON is easier to deal with than XML

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $provider = str_replace( '{format}', 'json', $providerurl ); // JSON is easier to deal with than XML.

</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">@@ -439,7 +439,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                $args = apply_filters( 'oembed_remote_get_args', $args, $url );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Fetch URL content

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Fetch URL content.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $request = wp_safe_remote_get( $url, $args );

</span><span class="cx" style="display: block; padding: 0 10px">                $html    = wp_remote_retrieve_body( $request );

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $html ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -462,13 +462,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                )

</span><span class="cx" style="display: block; padding: 0 10px">                        );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Strip <body>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Strip <body>.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $html_head_end = stripos( $html, '</head>' );

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( $html_head_end ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $html = substr( $html, 0, $html_head_end );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Do a quick check

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Do a quick check.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $tagfound = false;

</span><span class="cx" style="display: block; padding: 0 10px">                        foreach ( $linktypes as $linktype => $format ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( stripos( $html, $linktype ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -484,7 +484,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        if ( ! empty( $atts['type'] ) && ! empty( $linktypes[ $atts['type'] ] ) && ! empty( $atts['href'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                $providers[ $linktypes[ $atts['type'] ] ] = htmlspecialchars_decode( $atts['href'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                // Stop here if it's JSON (that's all we need)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         // Stop here if it's JSON (that's all we need).

</ins><span class="cx" style="display: block; padding: 0 10px">                                                 if ( 'json' == $linktypes[ $atts['type'] ] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                        break;

</span><span class="cx" style="display: block; padding: 0 10px">                                                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -493,7 +493,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // JSON is preferred to XML

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // JSON is preferred to XML.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! empty( $providers['json'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return $providers['json'];

</span><span class="cx" style="display: block; padding: 0 10px">                } elseif ( ! empty( $providers['xml'] ) ) {

</span></span></pre></div>

<a id="trunksrcwpincludesclasswppausedextensionsstoragephp"></a>

<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-paused-extensions-storage.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-paused-extensions-storage.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/class-wp-paused-extensions-storage.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,7 +3,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">  * Error Protection API: WP_Paused_Extensions_Storage class

</span><span class="cx" style="display: block; padding: 0 10px">  *

</span><span class="cx" style="display: block; padding: 0 10px">  * @package WordPress

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since   5.2.0

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.2.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="trunksrcwpincludesclasswpposttypephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-post-type.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-post-type.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/class-wp-post-type.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -423,27 +423,27 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $args['name'] = $this->name;

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If not set, default to the setting for public.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If not set, default to the setting for 'public'.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( null === $args['publicly_queryable'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $args['publicly_queryable'] = $args['public'];

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If not set, default to the setting for public.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If not set, default to the setting for 'public'.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( null === $args['show_ui'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $args['show_ui'] = $args['public'];

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If not set, default to the setting for show_ui.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If not set, default to the setting for 'show_ui'.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( null === $args['show_in_menu'] || ! $args['show_ui'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $args['show_in_menu'] = $args['show_ui'];

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If not set, default to the whether the full UI is shown.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If not set, default to the setting for 'show_in_menu'.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( null === $args['show_in_admin_bar'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $args['show_in_admin_bar'] = (bool) $args['show_in_menu'];

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If not set, default to the setting for public.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If not set, default to the setting for 'public'.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( null === $args['show_in_nav_menus'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $args['show_in_nav_menus'] = $args['public'];

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span></span></pre></div>

<a id="trunksrcwpincludesclasswpqueryphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-query.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-query.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/class-wp-query.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -771,8 +771,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $qv['w']        = absint( $qv['w'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $qv['m']        = is_scalar( $qv['m'] ) ? preg_replace( '|[^0-9]|', '', $qv['m'] ) : '';

</span><span class="cx" style="display: block; padding: 0 10px">                $qv['paged']    = absint( $qv['paged'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $qv['cat']      = preg_replace( '|[^0-9,-]|', '', $qv['cat'] ); // comma separated list of positive or negative integers

-               $qv['author']   = preg_replace( '|[^0-9,-]|', '', $qv['author'] ); // comma separated list of positive or negative integers

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $qv['cat']      = preg_replace( '|[^0-9,-]|', '', $qv['cat'] );    // Comma-separated list of positive or negative integers.

+               $qv['author']   = preg_replace( '|[^0-9,-]|', '', $qv['author'] ); // Comma-separated list of positive or negative integers.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $qv['pagename'] = trim( $qv['pagename'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $qv['name']     = trim( $qv['name'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $qv['title']    = trim( $qv['title'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -812,8 +812,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                } elseif ( $qv['p'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->is_single = true;

</span><span class="cx" style="display: block; padding: 0 10px">                } elseif ( ( '' !== $qv['hour'] ) && ( '' !== $qv['minute'] ) && ( '' !== $qv['second'] ) && ( '' != $qv['year'] ) && ( '' != $qv['monthnum'] ) && ( '' != $qv['day'] ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // If year, month, day, hour, minute, and second are set, a single

-                       // post is being queried.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // If year, month, day, hour, minute, and second are set,

+                       // a single post is being queried.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->is_single = true;

</span><span class="cx" style="display: block; padding: 0 10px">                } elseif ( '' != $qv['pagename'] || ! empty( $qv['page_id'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->is_page   = true;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -948,7 +948,7 @@

</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // if we're previewing inside the write screen

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If we're previewing inside the write screen.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( '' != $qv['preview'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->is_preview = true;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -974,10 +974,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->is_home = 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">-                // Correct is_* for page_on_front and page_for_posts

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Correct `is_*` for 'page_on_front' and 'page_for_posts'.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $this->is_home && 'page' == get_option( 'show_on_front' ) && get_option( 'page_on_front' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $_query = wp_parse_args( $this->query );

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // pagename can be set and empty depending on matched rewrite rules. Ignore an empty pagename.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // 'pagename' can be set and empty depending on matched rewrite rules. Ignore an empty 'pagename'.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( isset( $_query['pagename'] ) && '' == $_query['pagename'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                unset( $_query['pagename'] );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -988,7 +988,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->is_page = true;

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->is_home = false;

</span><span class="cx" style="display: block; padding: 0 10px">                                $qv['page_id'] = get_option( 'page_on_front' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Correct <!--nextpage--> for page_on_front

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Correct  for 'page_on_front'.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( ! empty( $qv['paged'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        $qv['page'] = $qv['paged'];

</span><span class="cx" style="display: block; padding: 0 10px">                                        unset( $qv['paged'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1001,7 +1001,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( $this->queried_object && 'attachment' == $this->queried_object->post_type ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( preg_match( '/^[^%]*%(?:postname)%/', get_option( 'permalink_structure' ) ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // See if we also have a post with the same slug

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // See if we also have a post with the same slug.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         $post = get_page_by_path( $qv['pagename'], OBJECT, 'post' );

</span><span class="cx" style="display: block; padding: 0 10px">                                        if ( $post ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                $this->queried_object = $post;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1061,7 +1061,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->is_singular = $this->is_single || $this->is_page || $this->is_attachment;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Done correcting is_* for page_on_front and page_for_posts

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Done correcting `is_*` for 'page_on_front' and 'page_for_posts'.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( '404' == $qv['error'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->set_404();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1108,7 +1108,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( get_taxonomies( array(), 'objects' ) as $taxonomy => $t ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( 'post_tag' == $taxonomy ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                continue;   // Handled further down in the $q['tag'] block

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         continue; // Handled further down in the $q['tag'] block.

</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 ( $t->query_var && ! empty( $q[ $t->query_var ] ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1148,12 +1148,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"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If querystring 'cat' is an array, implode it.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If query string 'cat' is an array, implode it.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( is_array( $q['cat'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $q['cat'] = implode( ',', $q['cat'] );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Category stuff

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Category stuff.

+

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! empty( $q['cat'] ) && ! $this->is_singular ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $cat_in     = array();

</span><span class="cx" style="display: block; padding: 0 10px">                        $cat_not_in = array();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1231,12 +1232,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"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If querystring 'tag' is array, implode it.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If query string 'tag' is array, implode it.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( is_array( $q['tag'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $q['tag'] = implode( ',', $q['tag'] );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Tag stuff

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Tag stuff.

+

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( '' != $q['tag'] && ! $this->is_singular && $this->query_vars_changed ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( strpos( $q['tag'], ',' ) !== false ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $tags = preg_split( '/[,\r\n\t ]+/', $q['tag'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1336,12 +1338,12 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $search = '';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // added slashes screw with quote grouping when done early, so done later

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Added slashes screw with quote grouping when done early, so done later.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $q['s'] = stripslashes( $q['s'] );

</span><span class="cx" style="display: block; padding: 0 10px">                if ( empty( $_GET['s'] ) && $this->is_main_query() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $q['s'] = urldecode( $q['s'] );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // there are no line breaks in <input /> fields

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // There are no line breaks in <input /> fields.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $q['s']                  = str_replace( array( "\r", "\n" ), '', $q['s'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $q['search_terms_count'] = 1;

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! empty( $q['sentence'] ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1350,7 +1352,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( preg_match_all( '/".*?("|$)|((?<=[\t ",+])|^)[^\t ",+]+/', $q['s'], $matches ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $q['search_terms_count'] = count( $matches[0] );

</span><span class="cx" style="display: block; padding: 0 10px">                                $q['search_terms']       = $this->parse_search_terms( $matches[0] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // if the search string has only short terms or stopwords, or is 10+ terms long, match it as sentence

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // If the search string has only short terms or stopwords, or is 10+ terms long, match it as sentence.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( empty( $q['search_terms'] ) || count( $q['search_terms'] ) > 9 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        $q['search_terms'] = array( $q['s'] );

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1424,7 +1426,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $stopwords = $this->get_search_stopwords();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $terms as $term ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // keep before/after spaces when term is for exact match

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Keep before/after spaces when term is for exact match.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( preg_match( '/^".+"$/', $term ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $term = trim( $term, "\"'" );

</span><span class="cx" style="display: block; padding: 0 10px">                        } else {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1514,17 +1516,17 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $search_orderby = '';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // sentence match in 'post_title'

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Sentence match in 'post_title'.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( $like ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $search_orderby .= $wpdb->prepare( "WHEN {$wpdb->posts}.post_title LIKE %s THEN 1 ", $like );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // sanity limit, sort as sentence when more than 6 terms

-                       // (few searches are longer than 6 terms and most titles are not)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Sanity limit, sort as sentence when more than 6 terms

+                       // (few searches are longer than 6 terms and most titles are not).

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( $num_terms < 7 ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // all words in title

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // All words in title.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $search_orderby .= 'WHEN ' . implode( ' AND ', $q['search_orderby_title'] ) . ' THEN 2 ';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // any word in title, not needed when $num_terms == 1

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Any word in title, not needed when $num_terms == 1.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( $num_terms > 1 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        $search_orderby .= 'WHEN ' . implode( ' OR ', $q['search_orderby_title'] ) . ' THEN 3 ';

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1540,7 +1542,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                $search_orderby = '(CASE ' . $search_orderby . 'ELSE 6 END)';

</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">-                        // single word or sentence search

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Single word or sentence search.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $search_orderby = reset( $q['search_orderby_title'] ) . ' DESC';

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1772,14 +1774,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">                // Shorthand.

</span><span class="cx" style="display: block; padding: 0 10px">                $q = &$this->query_vars;

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Fill again in case pre_get_posts unset some vars.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Fill again in case 'pre_get_posts' unset some vars.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $q = $this->fill_query_vars( $q );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Parse meta query

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Parse meta query.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->meta_query = new WP_Meta_Query();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->meta_query->parse_query_vars( $q );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set a flag if a pre_get_posts hook changed the query vars.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set a flag if a 'pre_get_posts' hook changed the query vars.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $hash = md5( serialize( $this->query_vars ) );

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $hash != $this->query_vars_hash ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->query_vars_changed = true;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1787,7 +1789,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">                unset( $hash );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // First let's clear some variables

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // First let's clear some variables.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $distinct         = '';

</span><span class="cx" style="display: block; padding: 0 10px">                $whichauthor      = '';

</span><span class="cx" style="display: block; padding: 0 10px">                $whichmimetype    = '';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1871,7 +1873,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 ( $this->is_feed ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // This overrides posts_per_page.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // This overrides 'posts_per_page'.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( ! empty( $q['posts_per_rss'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $q['posts_per_page'] = $q['posts_per_rss'];

</span><span class="cx" style="display: block; padding: 0 10px">                        } else {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1922,7 +1924,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                if ( '' !== $q['menu_order'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $where .= " AND {$wpdb->posts}.menu_order = " . $q['menu_order'];

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // The "m" parameter is meant for months but accepts datetimes of varying specificity

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // The "m" parameter is meant for months but accepts datetimes of varying specificity.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $q['m'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $where .= " AND YEAR({$wpdb->posts}.post_date)=" . substr( $q['m'], 0, 4 );

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( strlen( $q['m'] ) > 5 ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1942,7 +1944,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">-                // Handle the other individual date parameters

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Handle the other individual date parameters.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $date_parameters = array();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( '' !== $q['hour'] ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1979,7 +1981,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">                unset( $date_parameters, $date_query );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Handle complex date queries

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Handle complex date queries.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! empty( $q['date_query'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->date_query = new WP_Date_Query( $q['date_query'] );

</span><span class="cx" style="display: block; padding: 0 10px">                        $where           .= $this->date_query->get_sql();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2004,7 +2006,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                                // Only one request for a slug is possible, this is why name & pagename are overwritten above.

</span><span class="cx" style="display: block; padding: 0 10px">                                break;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        } //end foreach

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 } // End foreach.

</ins><span class="cx" style="display: block; padding: 0 10px">                         unset( $ptype_obj );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2072,7 +2074,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $q['p'] = absint( $q['attachment_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 a post number is specified, load that post

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If a post number is specified, load that post.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $q['p'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $where .= " AND {$wpdb->posts}.ID = " . $q['p'];

</span><span class="cx" style="display: block; padding: 0 10px">                } elseif ( $q['post__in'] ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2117,7 +2119,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $search = apply_filters_ref_array( 'posts_search', array( $search, &$this ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Taxonomies

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Taxonomies.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! $this->is_singular ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->parse_tax_query( $q );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2129,7 +2131,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $this->is_tax ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( empty( $post_type ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Do a fully inclusive search for currently registered post types of queried taxonomies

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Do a fully inclusive search for currently registered post types of queried taxonomies.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $post_type  = array();

</span><span class="cx" style="display: block; padding: 0 10px">                                $taxonomies = array_keys( $this->tax_query->queried_terms );

</span><span class="cx" style="display: block; padding: 0 10px">                                foreach ( get_post_types( array( 'exclude_from_search' => false ) ) as $pt ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2181,7 +2183,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">-                        // 'cat', 'category_name', 'tag_id'

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // 'cat', 'category_name', 'tag_id'.

</ins><span class="cx" style="display: block; padding: 0 10px">                         foreach ( $this->tax_query->queried_terms as $queried_taxonomy => $queried_items ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( empty( $queried_items['terms'][0] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        continue;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2210,7 +2212,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $groupby = "{$wpdb->posts}.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">-                // Author/user stuff

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Author/user stuff.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! empty( $q['author'] ) && $q['author'] != '0' ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $q['author'] = addslashes_gpc( '' . urldecode( $q['author'] ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2230,15 +2232,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $where     .= " AND {$wpdb->posts}.post_author IN ($author__in) ";

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Author stuff for nice URLs

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Author stuff for nice URLs.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( '' != $q['author_name'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( strpos( $q['author_name'], '/' ) !== false ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $q['author_name'] = explode( '/', $q['author_name'] );

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( $q['author_name'][ count( $q['author_name'] ) - 1 ] ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        $q['author_name'] = $q['author_name'][ count( $q['author_name'] ) - 1 ]; // no trailing slash

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 $q['author_name'] = $q['author_name'][ count( $q['author_name'] ) - 1 ]; // No trailing slash.

</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">-                                        $q['author_name'] = $q['author_name'][ count( $q['author_name'] ) - 2 ]; // there was a trailing slash

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 $q['author_name'] = $q['author_name'][ count( $q['author_name'] ) - 2 ]; // There was a trailing slash.

</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">                        $q['author_name'] = sanitize_title_for_query( $q['author_name'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2276,7 +2278,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">-                // MIME-Type stuff for attachment browsing

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // MIME-Type stuff for attachment browsing.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( isset( $q['post_mime_type'] ) && '' != $q['post_mime_type'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $whichmimetype = wp_post_mime_type_where( $q['post_mime_type'], $wpdb->posts );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2564,7 +2566,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $join = apply_filters_ref_array( 'posts_join', array( $join, &$this ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Paging

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Paging.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( empty( $q['nopaging'] ) && ! $this->is_singular ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $page = absint( $q['paged'] );

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! $page ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2581,13 +2583,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $limits = 'LIMIT ' . $pgstrt . $q['posts_per_page'];

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Comments feeds

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Comments feeds.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $this->is_comment_feed && ! $this->is_singular ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( $this->is_archive || $this->is_search ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $cjoin    = "JOIN {$wpdb->posts} ON ({$wpdb->comments}.comment_post_ID = {$wpdb->posts}.ID) $join ";

</span><span class="cx" style="display: block; padding: 0 10px">                                $cwhere   = "WHERE comment_approved = '1' $where";

</span><span class="cx" style="display: block; padding: 0 10px">                                $cgroupby = "{$wpdb->comments}.comment_id";

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        } else { // Other non singular e.g. front

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 } else { // Other non-singular, e.g. front.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $cjoin    = "JOIN {$wpdb->posts} ON ( {$wpdb->comments}.comment_post_ID = {$wpdb->posts}.ID )";

</span><span class="cx" style="display: block; padding: 0 10px">                                $cwhere   = "WHERE ( post_status = 'publish' OR ( post_status = 'inherit' AND post_type = 'attachment' ) ) AND comment_approved = '1'";

</span><span class="cx" style="display: block; padding: 0 10px">                                $cgroupby = '';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2650,7 +2652,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $climits  = ( ! empty( $climits ) ) ? $climits : '';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $comments = (array) $wpdb->get_results( "SELECT $distinct {$wpdb->comments}.* FROM {$wpdb->comments} $cjoin $cwhere $cgroupby $corderby $climits" );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Convert to WP_Comment

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Convert to WP_Comment.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->comments      = array_map( 'get_comment', $comments );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->comment_count = count( $this->comments );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2990,7 +2992,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $split_the_query = apply_filters( 'split_the_query', $split_the_query, $this );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( $split_the_query ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // First get the IDs and then fill in the objects

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // First get the IDs and then fill in the objects.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->request = "SELECT $found_rows $distinct {$wpdb->posts}.ID FROM {$wpdb->posts} $join WHERE 1=1 $where $groupby $orderby $limits";

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3056,7 +3058,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $comments_request = "SELECT {$wpdb->comments}.* FROM {$wpdb->comments} $cjoin $cwhere $cgroupby $corderby $climits";

</span><span class="cx" style="display: block; padding: 0 10px">                        $comments         = $wpdb->get_results( $comments_request );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Convert to WP_Comment

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Convert to WP_Comment.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->comments      = array_map( 'get_comment', $comments );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->comment_count = count( $this->comments );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3111,7 +3113,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">-                // Put sticky posts at the top of the posts array

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Put sticky posts at the top of the posts array.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $sticky_posts = get_option( 'sticky_posts' );

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $this->is_home && $page <= 1 && is_array( $sticky_posts ) && ! empty( $sticky_posts ) && ! $q['ignore_sticky_posts'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $num_posts     = count( $this->posts );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3120,13 +3122,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        for ( $i = 0; $i < $num_posts; $i++ ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( in_array( $this->posts[ $i ]->ID, $sticky_posts ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        $sticky_post = $this->posts[ $i ];

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Remove sticky from current position

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Remove sticky from current position.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         array_splice( $this->posts, $i, 1 );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Move to front, after other stickies

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Move to front, after other stickies.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         array_splice( $this->posts, $sticky_offset, 0, array( $sticky_post ) );

<span class="cx" style="display: block; padding: 0 10px">                                        // Increment the sticky offset. The next sticky will be placed at this offset.

</span><span class="cx" style="display: block; padding: 0 10px">                                        $sticky_offset++;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Remove post from sticky posts array

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Remove post from sticky posts array.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         $offset = array_search( $sticky_post->ID, $sticky_posts );

</span><span class="cx" style="display: block; padding: 0 10px">                                        unset( $sticky_posts[ $offset ] );

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3137,7 +3139,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                $sticky_posts = array_diff( $sticky_posts, $q['post__not_in'] );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Fetch sticky posts that weren't in the query results

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Fetch sticky posts that weren't in the query results.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( ! empty( $sticky_posts ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $stickies = get_posts(

</span><span class="cx" style="display: block; padding: 0 10px">                                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3280,7 +3282,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                global $post;

</span><span class="cx" style="display: block; padding: 0 10px">                $this->in_the_loop = true;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( $this->current_post == -1 ) { // loop has just started

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( $this->current_post == -1 ) { // Loop has just started.

</ins><span class="cx" style="display: block; padding: 0 10px">                         /**

<span class="cx" style="display: block; padding: 0 10px">                         * Fires once the loop is started.

</span><span class="cx" style="display: block; padding: 0 10px">                         *

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3316,7 +3318,7 @@

<span class="cx" style="display: block; padding: 0 10px">                         * @param WP_Query $this The WP_Query instance (passed by reference).

</span><span class="cx" style="display: block; padding: 0 10px">                         */

</span><span class="cx" style="display: block; padding: 0 10px">                        do_action_ref_array( 'loop_end', array( &$this ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Do some cleaning up after the loop

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Do some cleaning up after the loop.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->rewind_posts();

</span><span class="cx" style="display: block; padding: 0 10px">                } elseif ( 0 === $this->post_count ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3789,7 +3791,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"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Only a Taxonomy provided.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Only a taxonomy provided.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( empty( $term ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return true;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3886,7 +3888,7 @@

<span class="cx" style="display: block; padding: 0 10px">         * @return bool True, if front of site.

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function is_front_page() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // most likely case

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Most likely case.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( 'posts' == get_option( 'show_on_front' ) && $this->is_home() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return true;

</span><span class="cx" style="display: block; padding: 0 10px">                } elseif ( 'page' == get_option( 'show_on_front' ) && get_option( 'page_on_front' ) && $this->is_page( get_option( 'page_on_front' ) ) ) {

</span></span></pre></div>

<a id="trunksrcwpincludesclasswprecoverymodecookieservicephp"></a>

<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-recovery-mode-cookie-service.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-recovery-mode-cookie-service.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/class-wp-recovery-mode-cookie-service.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,7 +3,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">  * Error Protection API: WP_Recovery_Mode_Cookie_Service class

</span><span class="cx" style="display: block; padding: 0 10px">  *

</span><span class="cx" style="display: block; padding: 0 10px">  * @package WordPress

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since   5.2.0

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.2.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="trunksrcwpincludesclasswprecoverymodeemailservicephp"></a>

<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-recovery-mode-email-service.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-recovery-mode-email-service.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/class-wp-recovery-mode-email-service.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,7 +3,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">  * Error Protection API: WP_Recovery_Mode_Email_Link class

</span><span class="cx" style="display: block; padding: 0 10px">  *

</span><span class="cx" style="display: block; padding: 0 10px">  * @package WordPress

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since   5.2.0

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.2.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="trunksrcwpincludesclasswprecoverymodekeyservicephp"></a>

<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-recovery-mode-key-service.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-recovery-mode-key-service.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/class-wp-recovery-mode-key-service.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,7 +3,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">  * Error Protection API: WP_Recovery_Mode_Key_Service class

</span><span class="cx" style="display: block; padding: 0 10px">  *

</span><span class="cx" style="display: block; padding: 0 10px">  * @package WordPress

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since   5.2.0

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.2.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="trunksrcwpincludesclasswprecoverymodelinkservicephp"></a>

<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-recovery-mode-link-service.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-recovery-mode-link-service.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/class-wp-recovery-mode-link-service.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,7 +3,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">  * Error Protection API: WP_Recovery_Mode_Link_Handler class

</span><span class="cx" style="display: block; padding: 0 10px">  *

</span><span class="cx" style="display: block; padding: 0 10px">  * @package WordPress

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since   5.2.0

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.2.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="trunksrcwpincludesclasswprecoverymodephp"></a>

<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-recovery-mode.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-recovery-mode.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/class-wp-recovery-mode.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,7 +3,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">  * Error Protection API: WP_Recovery_Mode class

</span><span class="cx" style="display: block; padding: 0 10px">  *

</span><span class="cx" style="display: block; padding: 0 10px">  * @package WordPress

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since   5.2.0

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.2.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="trunksrcwpincludesclasswprewritephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-rewrite.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-rewrite.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/class-wp-rewrite.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -442,7 +442,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $page_attachment_uris = array();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $posts as $id => $post ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // URL => page name

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // URL => page name.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $uri         = get_page_uri( $id );

</span><span class="cx" style="display: block; padding: 0 10px">                        $attachments = $wpdb->get_results( $wpdb->prepare( "SELECT ID, post_name, post_parent FROM $wpdb->posts WHERE post_type = 'attachment' AND post_parent = %d", $id ) );

</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">@@ -897,7 +897,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $num_tokens = count( $tokens[0] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $index          = $this->index; //probably 'index.php'

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $index          = $this->index; // Probably 'index.php'.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $feedindex      = $index;

</span><span class="cx" style="display: block; padding: 0 10px">                $trackbackindex = $index;

</span><span class="cx" style="display: block; padding: 0 10px">                $embedindex     = $index;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1003,7 +1003,7 @@

<span class="cx" style="display: block; padding: 0 10px">                        // Start creating the array of rewrites for this dir.

</span><span class="cx" style="display: block; padding: 0 10px">                        $rewrite = array();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // ...adding on /feed/ regexes => queries

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // ...adding on /feed/ regexes => queries.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( $feed ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $rewrite = array(

</span><span class="cx" style="display: block; padding: 0 10px">                                        $feedmatch  => $feedquery,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1012,7 +1012,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        //...and /page/xx ones

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // ...and /page/xx ones.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( $paged ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $rewrite = array_merge( $rewrite, array( $pagematch => $pagequery ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1259,11 +1259,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        return $rewrite;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // robots.txt -- only if installed at the root

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // robots.txt -- only if installed at the root.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $home_path      = parse_url( home_url() );

</span><span class="cx" style="display: block; padding: 0 10px">                $robots_rewrite = ( empty( $home_path['path'] ) || '/' == $home_path['path'] ) ? array( 'robots\.txt$' => $this->index . '?robots=1' ) : array();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // favicon.ico -- only if installed at the root

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // favicon.ico -- only if installed at the root.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $favicon_rewrite = ( empty( $home_path['path'] ) || '/' == $home_path['path'] ) ? array( 'favicon\.ico$' => $this->index . '?favicon=1' ) : array();

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Old feed and service files.

</span></span></pre></div>

<a id="trunksrcwpincludesclasswpsessiontokensphp"></a>

<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-session-tokens.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-session-tokens.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/class-wp-session-tokens.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -143,7 +143,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $session['ua'] = wp_unslash( $_SERVER['HTTP_USER_AGENT'] );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Timestamp

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Timestamp.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $session['login'] = time();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $token = wp_generate_password( 43, false, false );

</span></span></pre></div>

<a id="trunksrcwpincludesclasswpsimplepiefilephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-simplepie-file.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-simplepie-file.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/class-wp-simplepie-file.php   2020-01-29 00:43:23 UTC (rev 47122)

</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">                                $args['headers'] = $this->headers;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( SIMPLEPIE_USERAGENT != $this->useragent ) { //Use default WP user agent unless custom has been specified

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 if ( SIMPLEPIE_USERAGENT != $this->useragent ) { // Use default WP user agent unless custom has been specified.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $args['user-agent'] = $this->useragent;

</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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/class-wp-site-query.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -198,7 +198,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'search'                 => '',

</span><span class="cx" style="display: block; padding: 0 10px">                        'search_columns'         => array(),

</span><span class="cx" style="display: block; padding: 0 10px">                        'count'                  => false,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'date_query'             => null, // See WP_Date_Query

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'date_query'             => null, // See WP_Date_Query.

</ins><span class="cx" style="display: block; padding: 0 10px">                         'update_site_cache'      => true,

</span><span class="cx" style="display: block; padding: 0 10px">                        'update_site_meta_cache' => true,

</span><span class="cx" style="display: block; padding: 0 10px">                        'meta_query'             => '',

</span></span></pre></div>

<a id="trunksrcwpincludesclasswptaxqueryphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-tax-query.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-tax-query.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/class-wp-tax-query.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -504,7 +504,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        protected function find_compatible_table_alias( $clause, $parent_query ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $alias = false;

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Sanity check. Only IN queries use the JOIN syntax .

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Sanity check. Only IN queries use the JOIN syntax.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! isset( $clause['operator'] ) || 'IN' !== $clause['operator'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return $alias;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -549,7 +549,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">-                        // so long as there are shared terms, include_children requires that a taxonomy is set

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // So long as there are shared terms, 'include_children' requires that a taxonomy is set.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $query['include_children'] = false;

</span><span class="cx" style="display: block; padding: 0 10px">                } elseif ( ! taxonomy_exists( $query['taxonomy'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $query = new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy.' ) );

</span></span></pre></div>

<a id="trunksrcwpincludesclasswptaxonomyphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-taxonomy.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-taxonomy.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/class-wp-taxonomy.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -283,7 +283,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $args = array_merge( $defaults, $args );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If not set, default to the setting for public.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If not set, default to the setting for 'public'.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( null === $args['publicly_queryable'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $args['publicly_queryable'] = $args['public'];

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -295,7 +295,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                $args['query_var'] = sanitize_title_with_dashes( $args['query_var'] );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                } else {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Force query_var to false for non-public taxonomies.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Force 'query_var' to false for non-public taxonomies.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $args['query_var'] = false;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -314,27 +314,27 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If not set, default to the setting for public.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If not set, default to the setting for 'public'.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( null === $args['show_ui'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $args['show_ui'] = $args['public'];

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If not set, default to the setting for show_ui.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If not set, default to the setting for 'show_ui'.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( null === $args['show_in_menu'] || ! $args['show_ui'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $args['show_in_menu'] = $args['show_ui'];

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If not set, default to the setting for public.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If not set, default to the setting for 'public'.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( null === $args['show_in_nav_menus'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $args['show_in_nav_menus'] = $args['public'];

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If not set, default to the setting for show_ui.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If not set, default to the setting for 'show_ui'.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( null === $args['show_tagcloud'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $args['show_tagcloud'] = $args['show_ui'];

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If not set, default to the setting for show_ui.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If not set, default to the setting for 'show_ui'.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( null === $args['show_in_quick_edit'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $args['show_in_quick_edit'] = $args['show_ui'];

</span><span class="cx" style="display: block; padding: 0 10px">                }

</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"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $args['object_type'] = array_unique( (array) $object_type );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If not set, use the default meta box

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If not set, use the default meta box.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( null === $args['meta_box_cb'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( $args['hierarchical'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $args['meta_box_cb'] = 'post_categories_meta_box';

</span></span></pre></div>

<a id="trunksrcwpincludesclasswptextdiffrenderertablephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-text-diff-renderer-table.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-text-diff-renderer-table.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/class-wp-text-diff-renderer-table.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -249,20 +249,22 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function _changed( $orig, $final ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $r = '';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Does the aforementioned additional processing

-               // *_matches tell what rows are "the same" in orig and final. Those pairs will be diffed to get word changes

-               //      match is numeric: an index in other column

-               //      match is 'X': no match. It is a new row

-               // *_rows are column vectors for the orig column and the final column.

-               //      row >= 0: an indix of the $orig or $final array

-               //      row  < 0: a blank row for that column

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /*

+                * Does the aforementioned additional processing:

+                * *_matches tell what rows are "the same" in orig and final. Those pairs will be diffed to get word changes.

+                * - match is numeric: an index in other column.

+                * - match is 'X': no match. It is a new row.

+                * *_rows are column vectors for the orig column and the final column.

+                * - row >= 0: an indix of the $orig or $final array.

+                * - row < 0: a blank row for that column.

+                */

</ins><span class="cx" style="display: block; padding: 0 10px">                 list($orig_matches, $final_matches, $orig_rows, $final_rows) = $this->interleave_changed_lines( $orig, $final );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // These will hold the word changes as determined by an inline diff

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // These will hold the word changes as determined by an inline diff.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $orig_diffs  = array();

</span><span class="cx" style="display: block; padding: 0 10px">                $final_diffs = array();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Compute word diffs for each matched pair using the inline diff

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Compute word diffs for each matched pair using the inline diff.

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $orig_matches as $o => $f ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( is_numeric( $o ) && is_numeric( $f ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $text_diff = new Text_Diff( 'auto', array( array( $orig[ $o ] ), array( $final[ $f ] ) ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -269,12 +271,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                $renderer  = new $this->inline_diff_renderer;

</span><span class="cx" style="display: block; padding: 0 10px">                                $diff      = $renderer->render( $text_diff );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // If they're too different, don't include any <ins> or <dels>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // If they're too different, don't include any <ins> or <del>'s.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( preg_match_all( '!(<ins>.*?</ins>|<del>.*?</del>)!', $diff, $diff_matches ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // length of all text between <ins> or <del>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Length of all text between <ins> or <del>.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         $stripped_matches = strlen( strip_tags( join( ' ', $diff_matches[0] ) ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // since we count lengith of text between <ins> or <del> (instead of picking just one),

-                                       //      we double the length of chars not in those tags.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Since we count length of text between <ins> or <del> (instead of picking just one),

+                                       // we double the length of chars not in those tags.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         $stripped_diff = strlen( strip_tags( $diff ) ) * 2 - $stripped_matches;

</span><span class="cx" style="display: block; padding: 0 10px">                                        $diff_ratio    = $stripped_matches / $stripped_diff;

</span><span class="cx" style="display: block; padding: 0 10px">                                        if ( $diff_ratio > $this->_diff_threshold ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -282,7 +284,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">-                                // Un-inline the diffs by removing del or ins

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Un-inline the diffs by removing <del> or <ins>.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $orig_diffs[ $o ]  = preg_replace( '|<ins>.*?</ins>|', '', $diff );

</span><span class="cx" style="display: block; padding: 0 10px">                                $final_diffs[ $f ] = preg_replace( '|<del>.*?</del>|', '', $diff );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -374,12 +376,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $o           = (int) $o;

</span><span class="cx" style="display: block; padding: 0 10px">                        $f           = (int) $f;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Already have better matches for these guys

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Already have better matches for these guys.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( isset( $orig_matches[ $o ] ) && isset( $final_matches[ $f ] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                continue;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // First match for these guys. Must be best match

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // First match for these guys. Must be best match.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( ! isset( $orig_matches[ $o ] ) && ! isset( $final_matches[ $f ] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $orig_matches[ $o ]  = $f;

</span><span class="cx" style="display: block; padding: 0 10px">                                $final_matches[ $f ] = $o;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -386,16 +388,16 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                continue;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Best match of this final is already taken?  Must mean this final is a new row.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Best match of this final is already taken? Must mean this final is a new row.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( isset( $orig_matches[ $o ] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $final_matches[ $f ] = 'x';

</span><span class="cx" style="display: block; padding: 0 10px">                        } elseif ( isset( $final_matches[ $f ] ) ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Best match of this orig is already taken?  Must mean this orig is a deleted row.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Best match of this orig is already taken? Must mean this orig is a deleted row.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $orig_matches[ $o ] = 'x';

</span><span class="cx" style="display: 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">-                // We read the text in this order

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // We read the text in this order.

</ins><span class="cx" style="display: block; padding: 0 10px">                 ksort( $orig_matches );

</span><span class="cx" style="display: block; padding: 0 10px">                ksort( $final_matches );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -421,7 +423,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">-                // Pad the ends with blank rows if the columns aren't the same length

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Pad the ends with blank rows if the columns aren't the same length.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $diff_count = count( $orig_rows ) - count( $final_rows );

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $diff_count < 0 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        while ( $diff_count < 0 ) {

</span></span></pre></div>

<a id="trunksrcwpincludesclasswpthemephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-theme.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-theme.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/class-wp-theme.php    2020-01-29 00:43:23 UTC (rev 47122)

</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">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Constructor for WP_Theme.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since  3.4.0

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @since 3.4.0

</ins><span class="cx" style="display: block; padding: 0 10px">          *

</span><span class="cx" style="display: block; padding: 0 10px">         * @global array $wp_theme_directories

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -435,7 +435,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * When converting the object to a string, the theme name is returned.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since  3.4.0

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @since 3.4.0

</ins><span class="cx" style="display: block; padding: 0 10px">          *

</span><span class="cx" style="display: block; padding: 0 10px">         * @return string Theme name, ready for display (translated)

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -448,7 +448,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @staticvar array $properties

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since  3.4.0

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @since 3.4.0

</ins><span class="cx" style="display: block; padding: 0 10px">          *

<span class="cx" style="display: block; padding: 0 10px">         * @param string $offset Property to check if set.

<span class="cx" style="display: block; padding: 0 10px">         * @return bool Whether the given property is set.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -477,7 +477,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="cx" style="display: block; padding: 0 10px">         * __get() magic method for properties formerly returned by current_theme_info()

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since  3.4.0

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @since 3.4.0

</ins><span class="cx" style="display: block; padding: 0 10px">          *

<span class="cx" style="display: block; padding: 0 10px">         * @param string $offset Property to get.

<span class="cx" style="display: block; padding: 0 10px">         * @return mixed Property value.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -521,7 +521,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="cx" style="display: block; padding: 0 10px">         * Method to implement ArrayAccess for keys formerly returned by get_themes()

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since  3.4.0

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @since 3.4.0

</ins><span class="cx" style="display: block; padding: 0 10px">          *

</span><span class="cx" style="display: block; padding: 0 10px">         * @param mixed $offset

</span><span class="cx" style="display: block; padding: 0 10px">         * @param mixed $value

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -531,7 +531,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="cx" style="display: block; padding: 0 10px">         * Method to implement ArrayAccess for keys formerly returned by get_themes()

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since  3.4.0

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @since 3.4.0

</ins><span class="cx" style="display: block; padding: 0 10px">          *

</span><span class="cx" style="display: block; padding: 0 10px">         * @param mixed $offset

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -542,7 +542,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @staticvar array $keys

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since  3.4.0

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @since 3.4.0

</ins><span class="cx" style="display: block; padding: 0 10px">          *

</span><span class="cx" style="display: block; padding: 0 10px">         * @param mixed $offset

</span><span class="cx" style="display: block; padding: 0 10px">         * @return bool

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -583,7 +583,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * and care should be taken to use `$theme::display( 'Name' )` to get a properly

<span class="cx" style="display: block; padding: 0 10px">         * translated 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">-         * @since  3.4.0

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @since 3.4.0

</ins><span class="cx" style="display: block; padding: 0 10px">          *

</span><span class="cx" style="display: block; padding: 0 10px">         * @param mixed $offset

</span><span class="cx" style="display: block; padding: 0 10px">         * @return mixed

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -959,7 +959,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                                'seasonal'          => __( 'Seasonal' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                        );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        $feature_list = get_theme_feature_list( false ); // No API

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 $feature_list = get_theme_feature_list( false ); // No API.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         foreach ( $feature_list as $tags ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                $tags_list += $tags;

</span><span class="cx" style="display: block; padding: 0 10px">                                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1341,7 +1341,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Loads the theme's textdomain.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Translation files are not inherited from the parent theme. Todo: if this fails for the

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Translation files are not inherited from the parent theme. TODO: If this fails for the

</ins><span class="cx" style="display: block; padding: 0 10px">          * child theme, it should probably try to load the parent theme's translations.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @since 3.4.0

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1414,7 +1414,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

<span class="cx" style="display: block; padding: 0 10px">         * This hits the filesystem.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since  4.4.0

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @since 4.4.0

</ins><span class="cx" style="display: block; padding: 0 10px">          *

<span class="cx" style="display: block; padding: 0 10px">         * @return WP_Theme|false Object, or false if no theme is installed, which would be bad.

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span></span></pre></div>

<a id="trunksrcwpincludesclasswpuserqueryphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-user-query.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-user-query.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/class-wp-user-query.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -58,7 +58,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        private $compat_fields = array( 'results', 'total_users' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // SQL clauses

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // SQL clauses.

</ins><span class="cx" style="display: block; padding: 0 10px">         public $query_fields;

</span><span class="cx" style="display: block; padding: 0 10px">        public $query_from;

</span><span class="cx" style="display: block; padding: 0 10px">        public $query_where;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -439,7 +439,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">-                // sorting

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Sorting.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $qv['order'] = isset( $qv['order'] ) ? strtoupper( $qv['order'] ) : '';

</span><span class="cx" style="display: block; padding: 0 10px">                $order       = $this->parse_order( $qv['order'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -489,7 +489,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->query_orderby = 'ORDER BY ' . implode( ', ', $orderby_array );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // limit

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Limit.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( isset( $qv['number'] ) && $qv['number'] > 0 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( $qv['offset'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->query_limit = $wpdb->prepare( 'LIMIT %d, %d', $qv['offset'], $qv['number'] );

</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">                } elseif ( 'name' == $orderby || 'display_name' == $orderby ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $_orderby = 'display_name';

</span><span class="cx" style="display: block; padding: 0 10px">                } elseif ( 'post_count' == $orderby ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // todo: avoid the JOIN

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // @todo Avoid the JOIN.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $where             = get_posts_by_author_sql( 'post' );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->query_from .= " LEFT OUTER JOIN (

</span><span class="cx" style="display: block; padding: 0 10px">                                SELECT post_author, COUNT(*) as post_count

</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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/class-wp-user.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -160,7 +160,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Sets up object properties, including capabilities.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since  3.3.0

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @since 3.3.0

</ins><span class="cx" style="display: block; padding: 0 10px">          *

<span class="cx" style="display: block; padding: 0 10px">         * @param object $data    User DB row object.

<span class="cx" style="display: block; padding: 0 10px">         * @param int    $site_id Optional. The site ID to initialize for.

</span></span></pre></div>

<a id="trunksrcwpincludesclasswpwalkerphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-walker.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-walker.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/class-wp-walker.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -135,7 +135,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $id_field = $this->db_fields['id'];

</span><span class="cx" style="display: block; padding: 0 10px">                $id       = $element->$id_field;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //display this element

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Display this element.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->has_children = ! empty( $children_elements[ $id ] );

</span><span class="cx" style="display: block; padding: 0 10px">                if ( isset( $args[0] ) && is_array( $args[0] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $args[0]['has_children'] = $this->has_children; // Back-compat.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -143,7 +143,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->start_el( $output, $element, $depth, ...array_values( $args ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // descend only when the depth is right and there are childrens for this element

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Descend only when the depth is right and there are childrens for this element.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ( $max_depth == 0 || $max_depth > $depth + 1 ) && isset( $children_elements[ $id ] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        foreach ( $children_elements[ $id ] as $child ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -150,7 +150,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( ! isset( $newlevel ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        $newlevel = true;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        //start the child delimiter

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Start the child delimiter.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         $this->start_lvl( $output, $depth, ...array_values( $args ) );

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->display_element( $child, $children_elements, $max_depth, $depth + 1, $args, $output );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -159,11 +159,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( isset( $newlevel ) && $newlevel ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        //end the child delimiter

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // End the child delimiter.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->end_lvl( $output, $depth, ...array_values( $args ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //end this element

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // End this element.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->end_el( $output, $element, $depth, ...array_values( $args ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -188,7 +188,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function walk( $elements, $max_depth, ...$args ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $output = '';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //invalid parameter or nothing to walk

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Invalid parameter or nothing to walk.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $max_depth < -1 || empty( $elements ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return $output;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -195,7 +195,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $parent_field = $this->db_fields['parent'];

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // flat display

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Flat display.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( -1 == $max_depth ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $empty_array = array();

</span><span class="cx" style="display: block; padding: 0 10px">                        foreach ( $elements as $e ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -295,7 +295,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $total_top = count( $elements );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $page_num < 1 || $per_page < 0 ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // No paging

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // No paging.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $paging = false;

</span><span class="cx" style="display: block; padding: 0 10px">                        $start  = 0;

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( -1 == $max_depth ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -311,7 +311,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // flat display

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Flat display.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( -1 == $max_depth ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! empty( $args[0]['reverse_top_level'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $elements = array_reverse( $elements );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -444,4 +444,4 @@

</span><span class="cx" style="display: block; padding: 0 10px">                unset( $children_elements[ $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">-} // Walker

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+}

</ins></span></pre></div>

<a id="trunksrcwpincludesclasswpwidgetfactoryphp"></a>

<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-widget-factory.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-widget-factory.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/class-wp-widget-factory.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -93,7 +93,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $registered = array_map( '_get_widget_id_base', $registered );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $keys as $key ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // don't register new widget if old widget with the same id is already registered

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Don't register new widget if old widget with the same id is already registered.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( in_array( $this->widgets[ $key ]->id_base, $registered, true ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                unset( $this->widgets[ $key ] );

</span><span class="cx" style="display: block; padding: 0 10px">                                continue;

</span></span></pre></div>

<a id="trunksrcwpincludesclasswpwidgetphp"></a>

<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-widget.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-widget.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/class-wp-widget.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -399,13 +399,13 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $all_instances = $this->get_settings();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // We need to update the data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // We need to update the data.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $this->updated ) {

</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><span class="cx" style="display: block; padding: 0 10px">                if ( isset( $_POST['delete_widget'] ) && $_POST['delete_widget'] ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Delete the settings for this instance of the widget

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Delete the settings for this instance of the widget.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( isset( $_POST['the-widget-id'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $del_id = $_POST['the-widget-id'];

</span><span class="cx" style="display: block; padding: 0 10px">                        } else {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -464,7 +464,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        $all_instances[ $number ] = $instance;

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                break; // run only once

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         break; // Run only once.

</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">@@ -494,7 +494,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $all_instances = $this->get_settings();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( -1 == $widget_args['number'] ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // We echo out a form where 'number' can be set later

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // We echo out a form where 'number' can be set later.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->_set( '__i__' );

</span><span class="cx" style="display: block; padding: 0 10px">                        $instance = array();

</span><span class="cx" style="display: block; padding: 0 10px">                } else {

</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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/class-wp-xmlrpc-server.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,7 +60,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function __construct() {

</span><span class="cx" style="display: block; padding: 0 10px">                $this->methods = array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // WordPress API

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // WordPress API.

</ins><span class="cx" style="display: block; padding: 0 10px">                         'wp.getUsersBlogs'                 => 'this:wp_getUsersBlogs',

</span><span class="cx" style="display: block; padding: 0 10px">                        'wp.newPost'                       => 'this:wp_newPost',

</span><span class="cx" style="display: block; padding: 0 10px">                        'wp.editPost'                      => 'this:wp_editPost',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -85,13 +85,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'wp.editPage'                      => 'this:wp_editPage',

</span><span class="cx" style="display: block; padding: 0 10px">                        'wp.getPageList'                   => 'this:wp_getPageList',

</span><span class="cx" style="display: block; padding: 0 10px">                        'wp.getAuthors'                    => 'this:wp_getAuthors',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'wp.getCategories'                 => 'this:mw_getCategories',     // Alias

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'wp.getCategories'                 => 'this:mw_getCategories',     // Alias.

</ins><span class="cx" style="display: block; padding: 0 10px">                         'wp.getTags'                       => 'this:wp_getTags',

</span><span class="cx" style="display: block; padding: 0 10px">                        'wp.newCategory'                   => 'this:wp_newCategory',

</span><span class="cx" style="display: block; padding: 0 10px">                        'wp.deleteCategory'                => 'this:wp_deleteCategory',

</span><span class="cx" style="display: block; padding: 0 10px">                        'wp.suggestCategories'             => 'this:wp_suggestCategories',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'wp.uploadFile'                    => 'this:mw_newMediaObject',    // Alias

-                       'wp.deleteFile'                    => 'this:wp_deletePost',        // Alias

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'wp.uploadFile'                    => 'this:mw_newMediaObject',    // Alias.

+                       'wp.deleteFile'                    => 'this:wp_deletePost',        // Alias.

</ins><span class="cx" style="display: block; padding: 0 10px">                         'wp.getCommentCount'               => 'this:wp_getCommentCount',

</span><span class="cx" style="display: block; padding: 0 10px">                        'wp.getPostStatusList'             => 'this:wp_getPostStatusList',

</span><span class="cx" style="display: block; padding: 0 10px">                        'wp.getPageStatusList'             => 'this:wp_getPageStatusList',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -112,7 +112,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'wp.getRevisions'                  => 'this:wp_getRevisions',

</span><span class="cx" style="display: block; padding: 0 10px">                        'wp.restoreRevision'               => 'this:wp_restoreRevision',

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Blogger API

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Blogger API.

</ins><span class="cx" style="display: block; padding: 0 10px">                         'blogger.getUsersBlogs'            => 'this:blogger_getUsersBlogs',

</span><span class="cx" style="display: block; padding: 0 10px">                        'blogger.getUserInfo'              => 'this:blogger_getUserInfo',

</span><span class="cx" style="display: block; padding: 0 10px">                        'blogger.getPost'                  => 'this:blogger_getPost',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -121,7 +121,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'blogger.editPost'                 => 'this:blogger_editPost',

</span><span class="cx" style="display: block; padding: 0 10px">                        'blogger.deletePost'               => 'this:blogger_deletePost',

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // MetaWeblog API (with MT extensions to structs)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // MetaWeblog API (with MT extensions to structs).

</ins><span class="cx" style="display: block; padding: 0 10px">                         'metaWeblog.newPost'               => 'this:mw_newPost',

</span><span class="cx" style="display: block; padding: 0 10px">                        'metaWeblog.editPost'              => 'this:mw_editPost',

</span><span class="cx" style="display: block; padding: 0 10px">                        'metaWeblog.getPost'               => 'this:mw_getPost',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -129,12 +129,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'metaWeblog.getCategories'         => 'this:mw_getCategories',

</span><span class="cx" style="display: block; padding: 0 10px">                        'metaWeblog.newMediaObject'        => 'this:mw_newMediaObject',

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // MetaWeblog API aliases for Blogger API

-                       // see http://www.xmlrpc.com/stories/storyReader$2460

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // MetaWeblog API aliases for Blogger API.

+                       // See http://www.xmlrpc.com/stories/storyReader$2460

</ins><span class="cx" style="display: block; padding: 0 10px">                         'metaWeblog.deletePost'            => 'this:blogger_deletePost',

</span><span class="cx" style="display: block; padding: 0 10px">                        'metaWeblog.getUsersBlogs'         => 'this:blogger_getUsersBlogs',

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // MovableType API

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // MovableType API.

</ins><span class="cx" style="display: block; padding: 0 10px">                         'mt.getCategoryList'               => 'this:mt_getCategoryList',

</span><span class="cx" style="display: block; padding: 0 10px">                        'mt.getRecentPostTitles'           => 'this:mt_getRecentPostTitles',

</span><span class="cx" style="display: block; padding: 0 10px">                        'mt.getPostCategories'             => 'this:mt_getPostCategories',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -144,7 +144,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'mt.getTrackbackPings'             => 'this:mt_getTrackbackPings',

</span><span class="cx" style="display: block; padding: 0 10px">                        'mt.publishPost'                   => 'this:mt_publishPost',

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // PingBack

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Pingback.

</ins><span class="cx" style="display: block; padding: 0 10px">                         'pingback.ping'                    => 'this:pingback_ping',

</span><span class="cx" style="display: block; padding: 0 10px">                        'pingback.extensions.getPingbacks' => 'this:pingback_extensions_getPingbacks',

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -207,7 +207,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @since 1.5.0

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

<span class="cx" style="display: block; padding: 0 10px">         *     @type int $number1 A number to add.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -278,7 +278,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                if ( is_wp_error( $user ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->error = new IXR_Error( 403, __( 'Incorrect username or password.' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Flag that authentication has failed once on this wp_xmlrpc_server instance

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Flag that authentication has failed once on this wp_xmlrpc_server instance.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->auth_failed = 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">@@ -473,7 +473,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function initialise_blog_option_info() {

</span><span class="cx" style="display: block; padding: 0 10px">                $this->blog_options = array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Read only options

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Read-only options.

</ins><span class="cx" style="display: block; padding: 0 10px">                         'software_name'           => array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'desc'     => __( 'Software Name' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                'readonly' => true,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -535,7 +535,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'value'    => current_theme_supports( 'post-thumbnails' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Updatable options

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Updatable options.

</ins><span class="cx" style="display: block; padding: 0 10px">                         'time_zone'               => array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'desc'     => __( 'Time Zone' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                'readonly' => false,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -657,7 +657,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        return $this->error;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If this isn't on WPMU then just use blogger_getUsersBlogs

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If this isn't on WPMU then just use blogger_getUsersBlogs().

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! is_multisite() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        array_unshift( $args, 1 );

</span><span class="cx" style="display: block; padding: 0 10px">                        return $this->blogger_getUsersBlogs( $args );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1220,7 +1220,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

<span class="cx" style="display: block; padding: 0 10px">         * @link https://en.wikipedia.org/wiki/RSS_enclosure for information on RSS enclosures.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: top-level arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

<span class="cx" style="display: block; padding: 0 10px">         *     @type int    $blog_id        Blog ID (unused).

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1276,13 +1276,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        return $this->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">-                // convert the date field back to IXR form

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Convert the date field back to IXR form.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( isset( $content_struct['post_date'] ) && ! ( $content_struct['post_date'] instanceof IXR_Date ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $content_struct['post_date'] = $this->_convert_date( $content_struct['post_date'] );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // ignore the existing GMT date if it is empty or a non-GMT date was supplied in $content_struct,

-               // since _insert_post will ignore the non-GMT date if the GMT date is set

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /*

+                * Ignore the existing GMT date if it is empty or a non-GMT date was supplied in $content_struct,

+                * since _insert_post() will ignore the non-GMT date if the GMT date is set.

+                */

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( isset( $content_struct['post_date_gmt'] ) && ! ( $content_struct['post_date_gmt'] instanceof IXR_Date ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( $content_struct['post_date_gmt'] == '0000-00-00 00:00:00' || isset( $content_struct['post_date'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                unset( $content_struct['post_date_gmt'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1489,7 +1491,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_data['post_thumbnail'] ) ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // empty value deletes, non-empty value adds/updates.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Empty value deletes, non-empty value adds/updates.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( ! $post_data['post_thumbnail'] ) {

</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">                        } elseif ( ! get_post( absint( $post_data['post_thumbnail'] ) ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1655,7 +1657,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @since 3.4.0

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

<span class="cx" style="display: block; padding: 0 10px">         *     @type int    $blog_id        Blog ID (unused).

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1713,10 +1715,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                /*

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 * If the API client did not provide post_date, then we must not perpetuate the value that was

-                * stored in the database, or it will appear to be an intentional edit. Conveying it here as if

-                * it was coming from the API client will cause an otherwise zeroed out post_date_gmt to get set

-                * with the value that was originally stored in the database when the draft was created.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+          * If the API client did not provide 'post_date', then we must not perpetuate the value that

+                * was stored in the database, or it will appear to be an intentional edit. Conveying it here

+                * as if it was coming from the API client will cause an otherwise zeroed out 'post_date_gmt'

+                * to get set with the value that was originally stored in the database when the draft was created.

</ins><span class="cx" style="display: block; padding: 0 10px">                  */

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! isset( $content_struct['post_date'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        unset( $post['post_date'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1740,7 +1742,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @see wp_delete_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">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

<span class="cx" style="display: block; padding: 0 10px">         *     @type int    $blog_id  Blog ID (unused).

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2041,7 +2043,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $taxonomy = (array) $taxonomy;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // hold the data of the term

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Hold the data of the term.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $term_data = array();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $term_data['name'] = trim( $content_struct['name'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2142,7 +2144,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $taxonomy = (array) $taxonomy;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // hold the data of the term

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Hold the data of the term.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $term_data = array();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $term = get_term( $term_id, $content_struct['taxonomy'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2219,7 +2221,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @see wp_delete_term()

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

<span class="cx" style="display: block; padding: 0 10px">         *     @type int    $blog_id      Blog ID (unused).

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2289,7 +2291,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @see get_term()

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

<span class="cx" style="display: block; padding: 0 10px">         *     @type int    $blog_id  Blog ID (unused).

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2362,7 +2364,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @see get_terms()

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

<span class="cx" style="display: block; padding: 0 10px">         *     @type int    $blog_id  Blog ID (unused).

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2454,7 +2456,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @see get_taxonomy()

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

<span class="cx" style="display: block; padding: 0 10px">         *     @type int    $blog_id  Blog ID (unused).

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2520,7 +2522,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @see get_taxonomies()

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

<span class="cx" style="display: block; padding: 0 10px">         *     @type int    $blog_id  Blog ID (unused).

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2560,11 +2562,11 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $taxonomies = get_taxonomies( $filter, 'objects' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // holds all the taxonomy data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Holds all the taxonomy data.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $struct = array();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $taxonomies as $taxonomy ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // capability check for post_types

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Capability check for post types.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( ! current_user_can( $taxonomy->cap->assign_terms ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                continue;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2588,7 +2590,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @uses get_userdata()

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         *     @type int    $blog_id (unused)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2670,7 +2672,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @uses get_users()

</span><span class="cx" style="display: block; padding: 0 10px">         * @see wp_getUser() for more on $fields and return values

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         *     @type int    $blog_id (unused)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2752,7 +2754,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @uses get_userdata()

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         *     @type int    $blog_id (unused)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2801,7 +2803,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @uses wp_update_user()

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         *     @type int    $blog_id (unused)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2841,11 +2843,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit your profile.' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // holds data of the user

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Holds data of the user.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $user_data       = array();

</span><span class="cx" style="display: block; padding: 0 10px">                $user_data['ID'] = $user->ID;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // only set the user details if it was given

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Only set the user details if they were given.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( isset( $content_struct['first_name'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $user_data['first_name'] = $content_struct['first_name'];

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2892,7 +2894,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @since 2.2.0

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         *     @type int    $blog_id (unused)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2930,7 +2932,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $page->ID && ( $page->post_type == 'page' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return $this->_prepare_page( $page );

</span><span class="cx" style="display: block; padding: 0 10px">                } else {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // If the page doesn't exist indicate that.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // If the page doesn't exist, indicate that.

</ins><span class="cx" style="display: block; padding: 0 10px">                         return new IXR_Error( 404, __( 'Sorry, no such page.' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2940,7 +2942,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @since 2.2.0

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         *     @type int    $blog_id (unused)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3001,7 +3003,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @see wp_xmlrpc_server::mw_newPost()

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         *     @type int    $blog_id (unused)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3012,7 +3014,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @return int|IXR_Error

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function wp_newPage( $args ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Items not escaped here will be escaped in newPost.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Items not escaped here will be escaped in wp_newPost().

</ins><span class="cx" style="display: block; padding: 0 10px">                 $username = $this->escape( $args[1] );

</span><span class="cx" style="display: block; padding: 0 10px">                $password = $this->escape( $args[2] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3027,7 +3029,7 @@

<span class="cx" style="display: block; padding: 0 10px">                // Mark this as content for a page.

</span><span class="cx" style="display: block; padding: 0 10px">                $args[3]['post_type'] = 'page';

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Let mw_newPost do all of the heavy lifting.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Let mw_newPost() do all of the heavy lifting.

</ins><span class="cx" style="display: block; padding: 0 10px">                 return $this->mw_newPost( $args );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3036,7 +3038,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @since 2.2.0

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         *     @type int    $blog_id (unused)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3061,7 +3063,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */

</span><span class="cx" style="display: block; padding: 0 10px">                do_action( 'xmlrpc_call', 'wp.deletePage' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Get the current page based on the page_id and

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Get the current page based on the 'page_id' and

</ins><span class="cx" style="display: block; padding: 0 10px">                 // make sure it is a page and not a post.

</span><span class="cx" style="display: block; padding: 0 10px">                $actual_page = get_post( $page_id, ARRAY_A );

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! $actual_page || ( $actual_page['post_type'] != 'page' ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3097,7 +3099,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @since 2.2.0

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         *     @type int    $blog_id (unused)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3110,7 +3112,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @return array|IXR_Error

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function wp_editPage( $args ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Items will be escaped in mw_editPost.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Items will be escaped in mw_editPost().

</ins><span class="cx" style="display: block; padding: 0 10px">                 $page_id  = (int) $args[1];

</span><span class="cx" style="display: block; padding: 0 10px">                $username = $args[2];

</span><span class="cx" style="display: block; padding: 0 10px">                $password = $args[3];

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3142,7 +3144,7 @@

<span class="cx" style="display: block; padding: 0 10px">                // Mark this as content for a page.

</span><span class="cx" style="display: block; padding: 0 10px">                $content['post_type'] = 'page';

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Arrange args in the way mw_editPost understands.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Arrange args in the way mw_editPost() understands.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $args = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        $page_id,

</span><span class="cx" style="display: block; padding: 0 10px">                        $username,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3151,7 +3153,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $publish,

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Let mw_editPost do all of the heavy lifting.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Let mw_editPost() do all of the heavy lifting.

</ins><span class="cx" style="display: block; padding: 0 10px">                 return $this->mw_editPost( $args );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3162,7 +3164,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

<span class="cx" style="display: block; padding: 0 10px">         * @global wpdb $wpdb WordPress database abstraction object.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         *     @type int    $blog_id (unused)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3191,7 +3193,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */

</span><span class="cx" style="display: block; padding: 0 10px">                do_action( 'xmlrpc_call', 'wp.getPageList' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Get list of pages ids and titles

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Get list of page IDs and titles.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $page_list = $wpdb->get_results(

</span><span class="cx" style="display: block; padding: 0 10px">                        "

</span><span class="cx" style="display: block; padding: 0 10px">                        SELECT ID page_id,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3225,7 +3227,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @since 2.2.0

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         *     @type int    $blog_id (unused)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3269,7 +3271,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @since 2.7.0

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         *     @type int    $blog_id (unused)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3321,7 +3323,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @since 2.2.0

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         *     @type int    $blog_id (unused)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3351,19 +3353,19 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        return new IXR_Error( 401, __( 'Sorry, you are not allowed to add a category.' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If no slug was provided make it empty so that

-               // WordPress will generate one.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If no slug was provided, make it empty

+               // so that WordPress will generate one.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( empty( $category['slug'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $category['slug'] = '';

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If no parent_id was provided make it empty

-               // so that it will be a top level page (no parent).

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If no parent_id was provided, make it empty

+               // so that it will be a top-level page (no parent).

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! isset( $category['parent_id'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $category['parent_id'] = '';

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If no description was provided make it empty.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If no description was provided, make it empty.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( empty( $category['description'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $category['description'] = '';

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3404,7 +3406,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         *     @type int    $blog_id (unused)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3455,7 +3457,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @since 2.2.0

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         *     @type int    $blog_id (unused)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3507,7 +3509,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @since 2.7.0

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         *     @type int    $blog_id (unused)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3560,7 +3562,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @since 2.7.0

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         *     @type int    $blog_id (unused)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3647,7 +3649,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @since 2.7.0

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         *     @type int    $blog_id (unused)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3713,7 +3715,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @since 2.7.0

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         *     @type int    $blog_id (unused)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3762,9 +3764,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $comment['comment_approved'] = $content_struct['status'];

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Do some timestamp voodoo

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Do some timestamp voodoo.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! empty( $content_struct['date_created_gmt'] ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // We know this is supposed to be GMT, so we're going to slap that Z on there by force

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // We know this is supposed to be GMT, so we're going to slap that Z on there by force.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $dateCreated                 = rtrim( $content_struct['date_created_gmt']->getIso(), 'Z' ) . 'Z';

</span><span class="cx" style="display: block; padding: 0 10px">                        $comment['comment_date']     = get_date_from_gmt( $dateCreated );

</span><span class="cx" style="display: block; padding: 0 10px">                        $comment['comment_date_gmt'] = iso8601_to_datetime( $dateCreated, 'gmt' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3813,7 +3815,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @since 2.7.0

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         *     @type int        $blog_id (unused)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3950,7 +3952,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @since 2.7.0

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         *     @type int    $blog_id (unused)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3985,7 +3987,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         *     @type int    $blog_id (unused)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4034,7 +4036,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         *     @type int    $blog_id (unused)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4069,7 +4071,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         *     @type int    $blog_id (unused)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4104,7 +4106,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @since 2.6.0

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         *     @type int    $blog_id (unused)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4139,7 +4141,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @since 2.6.0

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         *     @type int    $blog_id (unused)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4161,7 +4163,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        return $this->error;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If no specific options where asked for, return all of them

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If no specific options where asked for, return all of them.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( count( $options ) == 0 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $options = array_keys( $this->blog_options );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4183,7 +4185,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $options as $option ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( array_key_exists( $option, $this->blog_options ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $data[ $option ] = $this->blog_options[ $option ];

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                //Is the value static or dynamic?

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Is the value static or dynamic?

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( isset( $data[ $option ]['option'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        $data[ $option ]['value'] = get_option( $data[ $option ]['option'] );

</span><span class="cx" style="display: block; padding: 0 10px">                                        unset( $data[ $option ]['option'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4203,7 +4205,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @since 2.6.0

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         *     @type int    $blog_id (unused)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4243,7 +4245,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        update_option( $this->blog_options[ $o_name ]['option'], wp_unslash( $o_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">-                //Now return the updated values

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Now return the updated values.

</ins><span class="cx" style="display: block; padding: 0 10px">                 return $this->_getOptions( $option_names );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4252,7 +4254,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         *     @type int    $blog_id (unused)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4313,7 +4315,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         *     @type int    $blog_id (unused)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4371,7 +4373,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         *     @type int    $blog_id (unused)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4400,7 +4402,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $formats = get_post_format_strings();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // find out if they want a list of currently supports formats

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Find out if they want a list of currently supports formats.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( isset( $args[3] ) && is_array( $args[3] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( $args[3]['show-supported'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( current_theme_supports( 'post-formats' ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4425,7 +4427,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @see get_post_type_object()

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         *     @type int    $blog_id (unused)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4498,7 +4500,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @see get_post_types()

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         *     @type int    $blog_id (unused)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4561,7 +4563,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @uses wp_get_post_revisions()

</span><span class="cx" style="display: block; padding: 0 10px">         * @see wp_getPost() for more on $fields

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         *     @type int    $blog_id (unused)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4632,7 +4634,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                continue;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Skip autosaves

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Skip autosaves.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( wp_is_post_autosave( $revision ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                continue;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4650,7 +4652,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @uses wp_restore_post_revision()

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         *     @type int    $blog_id (unused)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4707,8 +4709,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                return (bool) $post;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /* Blogger API functions.

-        * specs on http://plant.blogger.com/api and https://groups.yahoo.com/group/bloggerDev/

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*

+        * Blogger API functions.

+        * Specs on http://plant.blogger.com/api and https://groups.yahoo.com/group/bloggerDev/

</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">@@ -4718,7 +4721,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @since 1.5.0

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         *     @type int    $blog_id (unused)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4808,7 +4811,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @since 1.5.0

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         *     @type int    $blog_id (unused)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4851,7 +4854,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @since 1.5.0

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         *     @type int    $blog_id (unused)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4906,7 +4909,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @since 1.5.0

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         *     @type string $appkey (unused)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4921,7 +4924,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->escape( $args );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // $args[0] = appkey - ignored

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // $args[0] = appkey - ignored.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $username = $args[2];

</span><span class="cx" style="display: block; padding: 0 10px">                $password = $args[3];

</span><span class="cx" style="display: block; padding: 0 10px">                if ( isset( $args[4] ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5079,7 +5082,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @since 1.5.0

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         *     @type int    $blog_id (unused)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5158,7 +5161,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @since 1.5.0

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         *     @type int    $blog_id (unused)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5212,8 +5215,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                return true;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /* MetaWeblog API functions

-        * specs on wherever Dave Winer wants them to be

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*

+        * MetaWeblog API functions.

+        * Specs on wherever Dave Winer wants them to be.

</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">@@ -5243,7 +5247,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @since 1.5.0

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         *     @type int    $blog_id (unused)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5296,7 +5300,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                $error_message = __( 'Sorry, you are not allowed to publish posts on this site.' );

</span><span class="cx" style="display: block; padding: 0 10px">                                $post_type     = 'post';

</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">-                                // No other post_type values are allowed here

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // No other 'post_type' values are allowed here.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 return new IXR_Error( 401, __( 'Invalid post type.' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                } else {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5318,7 +5322,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        return new IXR_Error( 401, $error_message );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check for a valid post format if one was given

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check for a valid post format if one was given.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( isset( $content_struct['wp_post_format'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $content_struct['wp_post_format'] = sanitize_key( $content_struct['wp_post_format'] );

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! array_key_exists( $content_struct['wp_post_format'], get_post_format_strings() ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5326,7 +5330,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">-                // Let WordPress generate the post_name (slug) unless

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Let WordPress generate the 'post_name' (slug) unless

</ins><span class="cx" style="display: block; padding: 0 10px">                 // one has been provided.

</span><span class="cx" style="display: block; padding: 0 10px">                $post_name = '';

</span><span class="cx" style="display: block; padding: 0 10px">                if ( isset( $content_struct['wp_slug'] ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5340,7 +5344,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $post_password = '';

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Only set a post parent if one was provided.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Only set a post parent if one was given.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( isset( $content_struct['wp_page_parent_id'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $post_parent = $content_struct['wp_page_parent_id'];

</span><span class="cx" style="display: block; padding: 0 10px">                } else {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5347,7 +5351,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $post_parent = 0;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Only set the menu_order if it was provided.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Only set the 'menu_order' if it was given.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( isset( $content_struct['wp_page_order'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $menu_order = $content_struct['wp_page_order'];

</span><span class="cx" style="display: block; padding: 0 10px">                } else {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5476,9 +5480,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Do some timestamp voodoo

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Do some timestamp voodoo.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! empty( $content_struct['date_created_gmt'] ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // We know this is supposed to be GMT, so we're going to slap that Z on there by force

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // We know this is supposed to be GMT, so we're going to slap that Z on there by force.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $dateCreated = rtrim( $content_struct['date_created_gmt']->getIso(), 'Z' ) . 'Z';

</span><span class="cx" style="display: block; padding: 0 10px">                } elseif ( ! empty( $content_struct['dateCreated'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $dateCreated = $content_struct['dateCreated']->getIso();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5508,7 +5512,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $post_ID        = get_default_post_to_edit( $post_type, true )->ID;

</span><span class="cx" style="display: block; padding: 0 10px">                $postdata['ID'] = $post_ID;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Only posts can be sticky

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Only posts can be sticky.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $post_type == 'post' && isset( $content_struct['sticky'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $data           = $postdata;

</span><span class="cx" style="display: block; padding: 0 10px">                        $data['sticky'] = $content_struct['sticky'];

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5530,7 +5534,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        unset( $content_struct['wp_post_thumbnail'] );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Handle enclosures

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Handle enclosures.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $thisEnclosure = isset( $content_struct['enclosure'] ) ? $content_struct['enclosure'] : null;

</span><span class="cx" style="display: block; padding: 0 10px">                $this->add_enclosure_if_new( $post_ID, $thisEnclosure );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5537,7 +5541,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->attach_uploads( $post_ID, $post_content );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                // Handle post formats if assigned, value is validated earlier

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // in this function

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // in this function.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( isset( $content_struct['wp_post_format'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        set_post_format( $post_ID, $content_struct['wp_post_format'] );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5605,7 +5609,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function attach_uploads( $post_ID, $post_content ) {

</span><span class="cx" style="display: block; padding: 0 10px">                global $wpdb;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // find any unattached files

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Find any unattached files.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $attachments = $wpdb->get_results( "SELECT ID, guid FROM {$wpdb->posts} WHERE post_parent = '0' AND post_type = 'attachment'" );

</span><span class="cx" style="display: block; padding: 0 10px">                if ( is_array( $attachments ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        foreach ( $attachments as $file ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5621,7 +5625,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @since 1.5.0

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         *     @type int    $blog_id (unused)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5673,7 +5677,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        return new IXR_Error( 401, __( 'The post type may not be changed.' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check for a valid post format if one was given

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check for a valid post format if one was given.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( isset( $content_struct['wp_post_format'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $content_struct['wp_post_format'] = sanitize_key( $content_struct['wp_post_format'] );

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! array_key_exists( $content_struct['wp_post_format'], get_post_format_strings() ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5710,7 +5714,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $post_parent = $content_struct['wp_page_parent_id'];

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Only set the menu_order if it was given.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Only set the 'menu_order' if it was given.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( isset( $content_struct['wp_page_order'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $menu_order = $content_struct['wp_page_order'];

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5722,7 +5726,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $post_author = $postdata['post_author'];

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Only set the post_author if one is set.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If an author id was provided then use it instead.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( isset( $content_struct['wp_author_id'] ) ) {

<span class="cx" style="display: block; padding: 0 10px">                        // Check permissions if attempting to switch author to or from another user.

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( $user->ID != $content_struct['wp_author_id'] || $user->ID != $post_author ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5896,7 +5900,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        return new IXR_Error( 500, __( 'Sorry, the post could not be updated.' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Only posts can be sticky

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Only posts can be sticky.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $post_type == 'post' && isset( $content_struct['sticky'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $data              = $newpost;

</span><span class="cx" style="display: block; padding: 0 10px">                        $data['sticky']    = $content_struct['sticky'];

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5953,7 +5957,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @since 1.5.0

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         *     @type int    $blog_id (unused)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6019,12 +6023,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $allow_comments = ( 'open' == $postdata['comment_status'] ) ? 1 : 0;

</span><span class="cx" style="display: block; padding: 0 10px">                        $allow_pings    = ( 'open' == $postdata['ping_status'] ) ? 1 : 0;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Consider future posts as published

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Consider future posts as published.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( $postdata['post_status'] === 'future' ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $postdata['post_status'] = 'publish';

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Get post format

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Get post format.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $post_format = get_post_format( $post_ID );

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( empty( $post_format ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $post_format = 'standard';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6056,8 +6060,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'title'                  => $postdata['post_title'],

</span><span class="cx" style="display: block; padding: 0 10px">                                'link'                   => $link,

</span><span class="cx" style="display: block; padding: 0 10px">                                'permaLink'              => $link,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // commented out because no other tool seems to use this

-                               //            'content' => $entry['post_content'],

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Commented out because no other tool seems to use this.

+                               // 'content' => $entry['post_content'],

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'categories'             => $categories,

</span><span class="cx" style="display: block; padding: 0 10px">                                'mt_excerpt'             => $postdata['post_excerpt'],

</span><span class="cx" style="display: block; padding: 0 10px">                                'mt_text_more'           => $post['extended'],

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6095,7 +6099,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @since 1.5.0

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         *     @type int    $blog_id (unused)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6171,12 +6175,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $allow_comments = ( 'open' == $entry['comment_status'] ) ? 1 : 0;

</span><span class="cx" style="display: block; padding: 0 10px">                        $allow_pings    = ( 'open' == $entry['ping_status'] ) ? 1 : 0;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Consider future posts as published

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Consider future posts as published.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( $entry['post_status'] === 'future' ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $entry['post_status'] = 'publish';

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Get post format

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Get post format.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $post_format = get_post_format( $entry['ID'] );

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( empty( $post_format ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $post_format = 'standard';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6190,7 +6194,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'title'                  => $entry['post_title'],

</span><span class="cx" style="display: block; padding: 0 10px">                                'link'                   => $link,

</span><span class="cx" style="display: block; padding: 0 10px">                                'permaLink'              => $link,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // commented out because no other tool seems to use this

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Commented out because no other tool seems to use this.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 // 'content' => $entry['post_content'],

</span><span class="cx" style="display: block; padding: 0 10px">                                'categories'             => $categories,

</span><span class="cx" style="display: block; padding: 0 10px">                                'mt_excerpt'             => $entry['post_excerpt'],

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6222,7 +6226,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @since 1.5.0

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         *     @type int    $blog_id (unused)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6281,7 +6285,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

<span class="cx" style="display: block; padding: 0 10px">         * @global wpdb $wpdb WordPress database abstraction object.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         *     @type int    $blog_id (unused)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6348,7 +6352,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $errorString = sprintf( __( 'Could not write file %1$s (%2$s).' ), $name, $upload['error'] );

</span><span class="cx" style="display: block; padding: 0 10px">                        return new IXR_Error( 500, $errorString );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Construct the attachment array

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Construct the attachment array.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post_id = 0;

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! empty( $data['post_id'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $post_id = (int) $data['post_id'];

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6366,7 +6370,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'guid'           => $upload['url'],

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Save the data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Save the data.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $id = wp_insert_attachment( $attachment, $upload['file'], $post_id );

</span><span class="cx" style="display: block; padding: 0 10px">                wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $upload['file'] ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6382,7 +6386,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $struct = $this->_prepare_media_item( get_post( $id ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Deprecated values

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Deprecated values.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $struct['id']   = $struct['attachment_id'];

</span><span class="cx" style="display: block; padding: 0 10px">                $struct['file'] = $struct['title'];

</span><span class="cx" style="display: block; padding: 0 10px">                $struct['url']  = $struct['link'];

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6390,8 +6394,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                return $struct;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /* MovableType API functions

-        * specs on http://www.movabletype.org/docs/mtmanual_programmatic.html

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*

+        * MovableType API functions.

+        * Specs on http://www.movabletype.org/docs/mtmanual_programmatic.html

</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">@@ -6399,7 +6404,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @since 1.5.0

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         *     @type int    $blog_id (unused)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6463,7 +6468,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @since 1.5.0

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         *     @type int    $blog_id (unused)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6516,7 +6521,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @since 1.5.0

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         *     @type int    $post_ID

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6550,7 +6555,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $categories = array();

</span><span class="cx" style="display: block; padding: 0 10px">                $catids     = wp_get_post_categories( intval( $post_ID ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // first listed category will be the primary category

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // First listed category will be the primary category.

</ins><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="cx" style="display: block; padding: 0 10px">                        $categories[] = array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6569,7 +6574,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @since 1.5.0

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         *     @type int    $post_ID

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6695,7 +6700,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @since 1.5.0

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         *     @type int    $post_ID

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6730,16 +6735,16 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $postdata['post_status'] = 'publish';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // retain old cats

-               $cats                      = wp_get_post_categories( $post_ID );

-               $postdata['post_category'] = $cats;

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Retain old categories.

+               $postdata['post_category'] = wp_get_post_categories( $post_ID );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->escape( $postdata );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                return wp_update_post( $postdata );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /* PingBack functions

-        * specs on www.hixie.ch/specs/pingback/pingback

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*

+        * Pingback functions.

+        * Specs on www.hixie.ch/specs/pingback/pingback

</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">@@ -6747,7 +6752,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @since 1.5.0

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array  $args {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $args {

</ins><span class="cx" style="display: block; padding: 0 10px">          *     Method arguments. Note: arguments must be ordered as documented.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         *     @type string $pagelinkedfrom

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6781,47 +6786,49 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        return $this->pingback_error( 0, __( 'A valid URL was not provided.' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check if the page linked to is in our site

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check if the page linked to is on our site.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $pos1 = strpos( $pagelinkedto, str_replace( array( 'http://www.', 'http://', 'https://www.', 'https://' ), '', get_option( 'home' ) ) );

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! $pos1 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return $this->pingback_error( 0, __( 'Is there no link to us?' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // let's find which post is linked to

-               // FIXME: does url_to_postid() cover all these cases already?

-               //        if so, then let's use it and drop the old code.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /*

+                * Let's find which post is linked to.

+                * FIXME: Does url_to_postid() cover all these cases already?

+                * If so, then let's use it and drop the old code.

+                */

</ins><span class="cx" style="display: block; padding: 0 10px">                 $urltest = parse_url( $pagelinkedto );

</span><span class="cx" style="display: block; padding: 0 10px">                $post_ID = url_to_postid( $pagelinkedto );

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $post_ID ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        // $way

</span><span class="cx" style="display: block; padding: 0 10px">                } elseif ( isset( $urltest['path'] ) && preg_match( '#p/[0-9]{1,}#', $urltest['path'], $match ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // the path defines the post_ID (archives/p/XXXX)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // The path defines the post_ID (archives/p/XXXX).

</ins><span class="cx" style="display: block; padding: 0 10px">                         $blah    = explode( '/', $match[0] );

</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['query'] ) && preg_match( '#p=[0-9]{1,}#', $urltest['query'], $match ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // the querystring defines the post_ID (?p=XXXX)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // The query string defines the post_ID (?p=XXXX).

</ins><span class="cx" style="display: block; padding: 0 10px">                         $blah    = explode( '=', $match[0] );

</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'] ) ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // an #anchor is there, it's either...

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // An #anchor is there, it's either...

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( intval( $urltest['fragment'] ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // ...an integer #XXXX (simplest case)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // ...an integer #XXXX (simplest case),

</ins><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // ...a post id in the form 'post-###'

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // ...a post ID in the form 'post-###',

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $post_ID = preg_replace( '/[^0-9]+/', '', $urltest['fragment'] );

</span><span class="cx" style="display: block; padding: 0 10px">                        } elseif ( is_string( $urltest['fragment'] ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // ...or a string #title, a little more complicated

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // ...or a string #title, a little more complicated.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $title   = preg_replace( '/[^a-z0-9]/i', '.', $urltest['fragment'] );

</span><span class="cx" style="display: block; padding: 0 10px">                                $sql     = $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_title RLIKE %s", $title );

</span><span class="cx" style="display: block; padding: 0 10px">                                $post_ID = $wpdb->get_var( $sql );

</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">-                                        // returning unknown error '0' is better than die()ing

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Returning unknown error '0' is better than die()'ing.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         return $this->pingback_error( 0, '' );

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                } else {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // TODO: Attempt to extract a post ID from the given URL

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // TODO: Attempt to extract a post ID from the given URL.

</ins><span class="cx" style="display: block; padding: 0 10px">                         return $this->pingback_error( 33, __( 'The specified target URL cannot be used as a target. It either doesn&#8217;t exist, or it is not a pingback-enabled resource.' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">                $post_ID = (int) $post_ID;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6828,7 +6835,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $post = get_post( $post_ID );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( ! $post ) { // Post_ID not found

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( ! $post ) { // Post not found.

</ins><span class="cx" style="display: block; padding: 0 10px">                         return $this->pingback_error( 33, __( 'The specified target URL cannot be used as a target. It either doesn&#8217;t exist, or it is not a pingback-enabled resource.' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6836,17 +6843,17 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        return $this->pingback_error( 0, __( 'The source URL and the target URL cannot both point to the same resource.' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check if pings are on

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check if pings are on.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! pings_open( $post ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return $this->pingback_error( 33, __( 'The specified target URL cannot be used as a target. It either doesn&#8217;t exist, or it is not a pingback-enabled resource.' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Let's check that the remote site didn't already pingback this entry

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Let's check that the remote site didn't already pingback this entry.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_author_url = %s", $post_ID, $pagelinkedfrom ) ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return $this->pingback_error( 48, __( 'The pingback has already been registered.' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // very stupid, but gives time to the 'from' server to publish !

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Very stupid, but gives time to the 'from' server to publish!

</ins><span class="cx" style="display: block; padding: 0 10px">                 sleep( 1 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $remote_ip = preg_replace( '/[^0-9a-fA-F:., ]/', '', $_SERVER['REMOTE_ADDR'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6854,7 +6861,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                /** This filter is documented in wp-includes/class-http.php */

</span><span class="cx" style="display: block; padding: 0 10px">                $user_agent = apply_filters( 'http_headers_useragent', 'WordPress/' . get_bloginfo( 'version' ) . '; ' . get_bloginfo( 'url' ), $pagelinkedfrom );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Let's check the remote site

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Let's check the remote site.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $http_api_args = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'timeout'             => 10,

</span><span class="cx" style="display: block; padding: 0 10px">                        'redirection'         => 0,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6904,16 +6911,16 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $preg_target = preg_quote( $pagelinkedto, '|' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $p as $para ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( strpos( $para, $pagelinkedto ) !== false ) { // it exists, but is it a link?

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 if ( strpos( $para, $pagelinkedto ) !== false ) { // It exists, but is it a link?

</ins><span class="cx" style="display: block; padding: 0 10px">                                 preg_match( '|<a[^>]+?' . $preg_target . '[^>]*>([^>]+?)</a>|', $para, $context );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // If the URL isn't in a link context, keep looking

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // If the URL isn't in a link context, keep looking.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( empty( $context ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        continue;

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // We're going to use this fake tag to mark the context in a bit

-                               // the marker is needed in case the link text appears more than once in the paragraph

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // We're going to use this fake tag to mark the context in a bit.

+                               // The marker is needed in case the link text appears more than once in the paragraph.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $excerpt = preg_replace( '|\</?wpcontext\>|', '', $para );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                // prevent really long link text

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6921,18 +6928,18 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        $context[1] = substr( $context[1], 0, 100 ) . '&#8230;';

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $marker      = '<wpcontext>' . $context[1] . '</wpcontext>';    // set up our marker

-                               $excerpt     = str_replace( $context[0], $marker, $excerpt ); // swap out the link for our marker

-                               $excerpt     = strip_tags( $excerpt, '<wpcontext>' );        // strip all tags but our context marker

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $marker      = '<wpcontext>' . $context[1] . '</wpcontext>';  // Set up our marker.

+                               $excerpt     = str_replace( $context[0], $marker, $excerpt ); // Swap out the link for our marker.

+                               $excerpt     = strip_tags( $excerpt, '<wpcontext>' );         // Strip all tags but our context marker.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $excerpt     = trim( $excerpt );

</span><span class="cx" style="display: block; padding: 0 10px">                                $preg_marker = preg_quote( $marker, '|' );

</span><span class="cx" style="display: block; padding: 0 10px">                                $excerpt     = preg_replace( "|.*?\s(.{0,100}$preg_marker.{0,100})\s.*|s", '$1', $excerpt );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $excerpt     = strip_tags( $excerpt ); // YES, again, to remove the marker wrapper

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $excerpt     = strip_tags( $excerpt ); // YES, again, to remove the marker wrapper.

</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="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( empty( $context ) ) { // Link to target not found

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( empty( $context ) ) { // Link to target not found.

</ins><span class="cx" style="display: block; padding: 0 10px">                         return $this->pingback_error( 17, __( 'The source URL does not contain a link to the target URL, and so cannot be used as a source.' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7002,7 +7009,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $post_ID = url_to_postid( $url );

</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">-                        // We aren't sure that the resource is available and/or pingback enabled

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // We aren't sure that the resource is available and/or pingback enabled.

</ins><span class="cx" style="display: block; padding: 0 10px">                         return $this->pingback_error( 33, __( 'The specified target URL cannot be used as a target. It either doesn&#8217;t exist, or it is not a pingback-enabled resource.' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7009,7 +7016,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $actual_post = get_post( $post_ID, ARRAY_A );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! $actual_post ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // No such post = resource not found

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // No such post = resource not found.

</ins><span class="cx" style="display: block; padding: 0 10px">                         return $this->pingback_error( 32, __( 'The specified target URL does not exist.' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunksrcwpincludesclasswpphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/class-wp.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -173,10 +173,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $home_path       = trim( parse_url( home_url(), PHP_URL_PATH ), '/' );

</span><span class="cx" style="display: block; padding: 0 10px">                        $home_path_regex = sprintf( '|^%s|i', preg_quote( $home_path, '|' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Trim path info from the end and the leading home path from the

-                       // front. For path info requests, this leaves us with the requesting

-                       // filename, if any. For 404 requests, this leaves us with the

-                       // requested permalink.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 /*

+                        * Trim path info from the end and the leading home path from the front.

+                        * For path info requests, this leaves us with the requesting filename, if any.

+                        * For 404 requests, this leaves us with the requested permalink.

+                        */

</ins><span class="cx" style="display: block; padding: 0 10px">                         $req_uri  = str_replace( $pathinfo, '', $req_uri );

</span><span class="cx" style="display: block; padding: 0 10px">                        $req_uri  = trim( $req_uri, '/' );

</span><span class="cx" style="display: block; padding: 0 10px">                        $req_uri  = preg_replace( $home_path_regex, '', $req_uri );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -189,7 +190,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $self     = trim( $self, '/' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        // The requested permalink is in $pathinfo for path info requests and

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        //  $req_uri for other requests.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // $req_uri for other requests.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( ! empty( $pathinfo ) && ! preg_match( '|^.*' . $wp_rewrite->index . '$|', $pathinfo ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $requested_path = $pathinfo;

</span><span class="cx" style="display: block; padding: 0 10px">                        } else {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -206,7 +207,7 @@

<span class="cx" style="display: block; padding: 0 10px">                        // Look for matches.

</span><span class="cx" style="display: block; padding: 0 10px">                        $request_match = $requested_path;

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( empty( $request_match ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // An empty request could only match against ^$ regex

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // An empty request could only match against ^$ regex.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( isset( $rewrite['$'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        $this->matched_rule = '$';

</span><span class="cx" style="display: block; padding: 0 10px">                                        $query              = $rewrite['$'];

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -323,7 +324,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">-                // Convert urldecoded spaces back into +

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Convert urldecoded spaces back into '+'.

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( get_taxonomies( array(), 'objects' ) as $taxonomy => $t ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( $t->query_var && isset( $this->query_vars[ $t->query_var ] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->query_vars[ $t->query_var ] = str_replace( ' ', '+', $this->query_vars[ $t->query_var ] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -343,7 +344,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Limit publicly queried post_types to those that are publicly_queryable

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Limit publicly queried post_types to those that are 'publicly_queryable'.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( isset( $this->query_vars['post_type'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $queryable_post_types = get_post_types( array( 'publicly_queryable' => true ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! is_array( $this->query_vars['post_type'] ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -417,7 +418,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                } elseif ( empty( $this->query_vars['feed'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $headers['Content-Type'] = get_option( 'html_type' ) . '; charset=' . get_option( 'blog_charset' );

</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">-                        // Set the correct content type for feeds

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Set the correct content type for feeds.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $type = $this->query_vars['feed'];

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( 'feed' == $this->query_vars['feed'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $type = get_default_feed();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -452,7 +453,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $headers['Last-Modified'] = $wp_last_modified;

</span><span class="cx" style="display: block; padding: 0 10px">                        $headers['ETag']          = $wp_etag;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Support for Conditional GET

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Support for conditional GET.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( isset( $_SERVER['HTTP_IF_NONE_MATCH'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $client_etag = wp_unslash( $_SERVER['HTTP_IF_NONE_MATCH'] );

</span><span class="cx" style="display: block; padding: 0 10px">                        } else {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -460,10 +461,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $client_last_modified = empty( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) ? '' : trim( $_SERVER['HTTP_IF_MODIFIED_SINCE'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // If string is empty, return 0. If not, attempt to parse into a timestamp

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // If string is empty, return 0. If not, attempt to parse into a timestamp.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $client_modified_timestamp = $client_last_modified ? strtotime( $client_last_modified ) : 0;

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Make a timestamp for our most recent modification...

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Make a timestamp for our most recent modification..

</ins><span class="cx" style="display: block; padding: 0 10px">                         $wp_modified_timestamp = strtotime( $wp_last_modified );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ( $client_last_modified && $client_etag ) ?

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -675,7 +676,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        header( 'X-Pingback: ' . get_bloginfo( 'pingback_url', 'display' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // check for paged content that exceeds the max number of pages

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Check for paged content that exceeds the max number of pages.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $next = '<!--nextpage-->';

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( $p && false !== strpos( $p->post_content, $next ) && ! empty( $this->query_vars['page'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        $page    = trim( $this->query_vars['page'], '/' );

</span></span></pre></div>

<a id="trunksrcwpincludesclasswpdependenciesphp"></a>

<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-dependencies.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class.wp-dependencies.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/class.wp-dependencies.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -152,7 +152,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $handle       = $handle_parts[0];

</span><span class="cx" style="display: block; padding: 0 10px">                        $queued       = in_array( $handle, $this->to_do, true );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( in_array( $handle, $this->done, true ) ) { // Already done

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 if ( in_array( $handle, $this->done, true ) ) { // Already done.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 continue;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -159,7 +159,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $moved     = $this->set_group( $handle, $recursion, $group );

</span><span class="cx" style="display: block; padding: 0 10px">                        $new_group = $this->groups[ $handle ];

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( $queued && ! $moved ) { // already queued and in the right group

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 if ( $queued && ! $moved ) { // Already queued and in the right group.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 continue;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -364,7 +364,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function query( $handle, $list = 'registered' ) {

</span><span class="cx" style="display: block; padding: 0 10px">                switch ( $list ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        case 'registered':

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        case 'scripts': // back compat

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 case 'scripts': // Back compat.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( isset( $this->registered[ $handle ] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        return $this->registered[ $handle ];

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -378,11 +378,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                return $this->recurse_deps( $this->queue, $handle );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        case 'to_do':

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        case 'to_print': // back compat

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 case 'to_print': // Back compat.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 return in_array( $handle, $this->to_do );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        case 'done':

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        case 'printed': // back compat

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 case 'printed': // Back compat.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 return in_array( $handle, $this->done );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">                return false;

</span></span></pre></div>

<a id="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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/comment-template.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -430,7 +430,7 @@

<span class="cx" style="display: block; padding: 0 10px">  * @return void|string Void if `$echo` argument is true, comment classes if `$echo` is false.

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function comment_class( $class = '', $comment = null, $post_id = null, $echo = true ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Separates classes with a single space, collates classes for comment DIV

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Separates classes with a single space, collates classes for comment DIV.

</ins><span class="cx" style="display: block; padding: 0 10px">         $class = 'class="' . join( ' ', get_comment_class( $class, $comment, $post_id ) ) . '"';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( $echo ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -465,7 +465,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                return $classes;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Get the comment type (comment, trackback),

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Get the comment type (comment, trackback).

</ins><span class="cx" style="display: block; padding: 0 10px">         $classes[] = ( empty( $comment->comment_type ) ) ? 'comment' : $comment->comment_type;

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">        // Add classes for comment authors that are registered users.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -473,7 +473,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        if ( $user ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $classes[] = 'byuser';

</span><span class="cx" style="display: block; padding: 0 10px">                $classes[] = 'comment-author-' . sanitize_html_class( $user->user_nicename, $comment->user_id );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // For comment authors who are the author of the post

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // For comment authors who are the author of the post.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post = get_post( $post_id );

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $post ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( $comment->user_id === $post->post_author ) {

</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"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $comment_alt++;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Alt for top-level comments

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Alt for top-level comments.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( 1 == $comment_depth ) {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $comment_thread_alt % 2 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $classes[] = 'thread-odd';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -907,10 +907,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                         */

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( 'on' === _x( 'off', 'Comment number declension: on or off' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $text = preg_replace( '#<span class="screen-reader-text">.+?</span>#', '', $more );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $text = preg_replace( '/&.+?;/', '', $text ); // Kill entities

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $text = preg_replace( '/&.+?;/', '', $text ); // Kill entities.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $text = trim( strip_tags( $text ), '% ' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Replace '% Comments' with a proper plural form

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Replace '% Comments' with a proper plural form.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( $text && ! preg_match( '/[0-9]+/', $text ) && false !== strpos( $more, '%' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        /* translators: %s: Number of comments. */

</span><span class="cx" style="display: block; padding: 0 10px">                                        $new_text = _n( '%s Comment', '%s Comments', $number );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -927,7 +927,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        } elseif ( $number == 0 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $output = ( false === $zero ) ? __( 'No Comments' ) : $zero;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        } else { // must be one

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else { // Must be one.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $output = ( false === $one ) ? __( '1 Comment' ) : $one;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1526,7 +1526,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                require( $include );

</span><span class="cx" style="display: block; padding: 0 10px">        } elseif ( file_exists( TEMPLATEPATH . $file ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                require( TEMPLATEPATH . $file );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        } else { // Backward compat code will be removed in a future release

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else { // Backward compat code will be removed in a future release.

</ins><span class="cx" style="display: block; padding: 0 10px">                 require( ABSPATH . WPINC . '/theme-compat/comments.php' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2052,7 +2052,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        $parsed_args = apply_filters( 'wp_list_comments_args', $parsed_args );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Figure out what comments we'll be looping through ($_comments)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Figure out what comments we'll be looping through ($_comments).

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( null !== $comments ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $comments = (array) $comments;

</span><span class="cx" style="display: block; padding: 0 10px">                if ( empty( $comments ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2176,7 +2176,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        set_query_var( 'cpage', $parsed_args['page'] );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Validation check

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Validation check.

</ins><span class="cx" style="display: block; padding: 0 10px">         $parsed_args['page'] = intval( $parsed_args['page'] );

</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -2452,7 +2452,7 @@

<span class="cx" style="display: block; padding: 0 10px">        // Ensure that the filtered args contain all required default values.

</span><span class="cx" style="display: block; padding: 0 10px">        $args = array_merge( $defaults, $args );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Remove aria-describedby from the email field if there's no associated description.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Remove `aria-describedby` from the email field if there's no associated description.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( isset( $args['fields']['email'] ) && false === strpos( $args['comment_notes_before'], 'id="email-notes"' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $args['fields']['email'] = str_replace(

</span><span class="cx" style="display: block; padding: 0 10px">                        ' aria-describedby="email-notes"',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2554,10 +2554,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                         */

</span><span class="cx" style="display: block; padding: 0 10px">                        $comment_fields = apply_filters( 'comment_form_fields', $comment_fields );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Get an array of field names, excluding the textarea

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Get an array of field names, excluding the textarea.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $comment_field_keys = array_diff( array_keys( $comment_fields ), array( 'comment' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Get the first and the last field name, excluding the textarea

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Get the first and the last field name, excluding the textarea.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $first_field = reset( $comment_field_keys );

</span><span class="cx" style="display: block; padding: 0 10px">                        $last_field  = end( $comment_field_keys );

</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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/comment.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -438,7 +438,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> //

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Comment meta functions

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Comment meta functions.

</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">@@ -657,7 +657,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> function wp_allow_comment( $commentdata, $avoid_die = false ) {

</span><span class="cx" style="display: block; padding: 0 10px">        global $wpdb;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Simple duplicate check

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Simple duplicate check.

</ins><span class="cx" style="display: block; padding: 0 10px">         // expected_slashed ($comment_post_ID, $comment_author, $comment_author_email, $comment_content)

</span><span class="cx" style="display: block; padding: 0 10px">        $dupe = $wpdb->prepare(

</span><span class="cx" style="display: block; padding: 0 10px">                "SELECT comment_ID FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_parent = %s AND comment_approved != 'trash' AND ( comment_author = %s ",

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -869,7 +869,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                return $is_flood;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // don't throttle admins or moderators

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Don't throttle admins or moderators.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( current_user_can( 'manage_options' ) || current_user_can( 'moderate_comments' ) ) {

</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">@@ -1093,7 +1093,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">-                // Find this comment's top level parent if threading is enabled

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Find this comment's top-level parent if threading is enabled.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $args['max_depth'] > 1 && 0 != $comment->comment_parent ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return get_page_of_comment( $comment->comment_parent, $args );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1120,7 +1120,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                if ( 0 == $older_comment_count ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $page = 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">-                        // Divide comments older than this one by comments per page to get this comment's page number

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Divide comments older than this one by comments per page to get this comment's page number.

</ins><span class="cx" style="display: block; padding: 0 10px">                 } else {

</span><span class="cx" style="display: block; padding: 0 10px">                        $page = ceil( ( $older_comment_count + 1 ) / $args['per_page'] );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1180,7 +1180,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $col_length = $wpdb->get_col_length( $wpdb->comments, $column );

</span><span class="cx" style="display: block; padding: 0 10px">                        $max_length = 0;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // No point if we can't get the DB column lengths

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // No point if we can't get the DB column lengths.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( is_wp_error( $col_length ) ) {

</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">@@ -1272,7 +1272,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $mod_keys = trim( get_option( 'blacklist_keys' ) );

</span><span class="cx" style="display: block; padding: 0 10px">        if ( '' == $mod_keys ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return false; // If moderation keys are empty

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return false; // If moderation keys are empty.

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">        // Ensure HTML tags are not being used to bypass the blacklist.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1283,12 +1283,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">        foreach ( (array) $words as $word ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $word = trim( $word );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Skip empty lines

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Skip empty lines.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( empty( $word ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        continue; }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Do some escaping magic so that '#' chars in the

-               // spam words don't break things:

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Do some escaping magic so that '#' chars

+               // in the spam words don't break things:

</ins><span class="cx" style="display: block; padding: 0 10px">                 $word = preg_quote( $word, '#' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $pattern = "#$word#i";

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1407,7 +1407,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                clean_comment_cache( $children );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Delete metadata

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Delete metadata.

</ins><span class="cx" style="display: block; padding: 0 10px">         $meta_ids = $wpdb->get_col( $wpdb->prepare( "SELECT meta_id FROM $wpdb->commentmeta WHERE comment_id = %d", $comment->comment_ID ) );

</span><span class="cx" style="display: block; padding: 0 10px">        foreach ( $meta_ids as $mid ) {

</span><span class="cx" style="display: block; padding: 0 10px">                delete_metadata_by_mid( 'comment', $mid );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1690,15 +1690,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function wp_transition_comment_status( $new_status, $old_status, $comment ) {

</span><span class="cx" style="display: block; padding: 0 10px">        /*

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Translate raw statuses to human readable formats for the hooks.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Translate raw statuses to human-readable formats for the hooks.

</ins><span class="cx" style="display: block; padding: 0 10px">          * This is not a complete list of comment status, it's only the ones

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * that need to be renamed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * that need to be renamed.

</ins><span class="cx" style="display: block; padding: 0 10px">          */

</span><span class="cx" style="display: block; padding: 0 10px">        $comment_statuses = array(

</span><span class="cx" style="display: block; padding: 0 10px">                0         => 'unapproved',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                'hold'    => 'unapproved', // wp_set_comment_status() uses "hold"

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         'hold'    => 'unapproved', // wp_set_comment_status() uses "hold".

</ins><span class="cx" style="display: block; padding: 0 10px">                 1         => 'approved',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                'approve' => 'approved', // wp_set_comment_status() uses "approve"

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         'approve' => 'approved',   // wp_set_comment_status() uses "approve".

</ins><span class="cx" style="display: block; padding: 0 10px">         );

</span><span class="cx" style="display: block; padding: 0 10px">        if ( isset( $comment_statuses[ $new_status ] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $new_status = $comment_statuses[ $new_status ];

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1707,7 +1707,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $old_status = $comment_statuses[ $old_status ];

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Call the hooks

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Call the hooks.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( $new_status != $old_status ) {

</span><span class="cx" style="display: block; padding: 0 10px">                /**

<span class="cx" style="display: block; padding: 0 10px">                 * Fires when the comment status is in transition.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2020,7 +2020,7 @@

<span class="cx" style="display: block; padding: 0 10px">  * @return bool Whether comment should be blocked.

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function wp_throttle_comment_flood( $block, $time_lastcomment, $time_newcomment ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        if ( $block ) { // a plugin has already blocked... we'll let that decision stand

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $block ) { // A plugin has already blocked... we'll let that decision stand.

</ins><span class="cx" style="display: block; padding: 0 10px">                 return $block;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ( $time_newcomment - $time_lastcomment ) < 15 ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2321,7 +2321,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> function wp_update_comment( $commentarr ) {

</span><span class="cx" style="display: block; padding: 0 10px">        global $wpdb;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // First, get all of the original fields

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // First, get all of the original fields.

</ins><span class="cx" style="display: block; padding: 0 10px">         $comment = get_comment( $commentarr['comment_ID'], ARRAY_A );

</span><span class="cx" style="display: block; padding: 0 10px">        if ( empty( $comment ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                return 0;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2430,7 +2430,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( is_bool( $defer ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $_defer = $defer;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // flush any deferred counts

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Flush any deferred counts.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! $defer ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        wp_update_comment_count( null, true );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2586,7 +2586,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">-        //Do not search for a pingback server on our own uploads

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Do not search for a pingback server on our own uploads.

</ins><span class="cx" style="display: block; padding: 0 10px">         $uploads_dir = wp_get_upload_dir();

</span><span class="cx" style="display: block; padding: 0 10px">        if ( 0 === strpos( $url, $uploads_dir['baseurl'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                return false;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2613,7 +2613,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">-        // Now do a GET since we're going to look in the html headers (and we're sure it's not a binary file)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Now do a GET since we're going to look in the html headers (and we're sure it's not a binary file).

</ins><span class="cx" style="display: block; padding: 0 10px">         $response = wp_safe_remote_get(

</span><span class="cx" style="display: block; padding: 0 10px">                $url,

</span><span class="cx" style="display: block; padding: 0 10px">                array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2639,7 +2639,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $pingback_server_url_len = $pingback_href_end - $pingback_href_start;

</span><span class="cx" style="display: block; padding: 0 10px">                $pingback_server_url     = substr( $contents, $pingback_href_start, $pingback_server_url_len );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // We may find rel="pingback" but an incomplete pingback URL

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // We may find rel="pingback" but an incomplete pingback URL.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $pingback_server_url_len > 0 ) { // We got it!

</span><span class="cx" style="display: block; padding: 0 10px">                        return $pingback_server_url;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2804,7 +2804,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        include_once( ABSPATH . WPINC . '/class-IXR.php' );

</span><span class="cx" style="display: block; padding: 0 10px">        include_once( ABSPATH . WPINC . '/class-wp-http-ixr-client.php' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // original code by Mort (http://mort.mine.nu:8080)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Original code by Mort (http://mort.mine.nu:8080).

</ins><span class="cx" style="display: block; padding: 0 10px">         $post_links = array();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</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">@@ -2818,22 +2818,27 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $content = $post->post_content;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Step 1

-       // Parsing the post, external links (if any) are stored in the $post_links array

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*

+        * Step 1.

+        * Parsing the post, external links (if any) are stored in the $post_links array.

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         $post_links_temp = wp_extract_urls( $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">-        // Step 2.

-       // Walking thru the links array

-       // first we get rid of links pointing to sites, not to specific files

-       // Example:

-       // http://dummy-weblog.org

-       // http://dummy-weblog.org/

-       // http://dummy-weblog.org/post.php

-       // We don't wanna ping first and second types, even if they have a valid <link/>

-

-       foreach ( (array) $post_links_temp as $link_test ) :

-               if ( ! in_array( $link_test, $pung ) && ( url_to_postid( $link_test ) != $post->ID ) // If we haven't pung it already and it isn't a link to itself

-                               && ! is_local_attachment( $link_test ) ) : // Also, let's never ping local attachments.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*

+        * Step 2.

+        * Walking through the links array.

+        * First we get rid of links pointing to sites, not to specific files.

+        * Example:

+        * http://dummy-weblog.org

+        * http://dummy-weblog.org/

+        * http://dummy-weblog.org/post.php

+        * We don't wanna ping first and second types, even if they have a valid <link/>.

+        */

+       foreach ( (array) $post_links_temp as $link_test ) {

+               // If we haven't pung it already and it isn't a link to itself.

+               if ( ! in_array( $link_test, $pung ) && ( url_to_postid( $link_test ) != $post->ID )

+                               // Also, let's never ping local attachments.

+                               && ! is_local_attachment( $link_test ) ) {

</ins><span class="cx" style="display: block; padding: 0 10px">                         $test = @parse_url( $link_test );

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( $test ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( isset( $test['query'] ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2842,10 +2847,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        $post_links[] = $link_test;

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                endif;

-       endforeach;

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         }

+       }

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $post_links = array_unique( $post_links );

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">         /**

<span class="cx" style="display: block; padding: 0 10px">         * Fires just before pinging back links found in a post.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2862,10 +2868,10 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $pingback_server_url ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        set_time_limit( 60 );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Now, the RPC call

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Now, the RPC call.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $pagelinkedfrom = get_permalink( $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">-                        // using a timeout of 3 seconds should be enough to cover slow servers

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Using a timeout of 3 seconds should be enough to cover slow servers.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $client          = new WP_HTTP_IXR_Client( $pingback_server_url );

</span><span class="cx" style="display: block; padding: 0 10px">                        $client->timeout = 3;

</span><span class="cx" style="display: block; padding: 0 10px">                        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2881,10 +2887,10 @@

<span class="cx" style="display: block; padding: 0 10px">                         * @param string $pagelinkedfrom      URL of page linked from.

</span><span class="cx" style="display: block; padding: 0 10px">                         */

</span><span class="cx" style="display: block; padding: 0 10px">                        $client->useragent = apply_filters( 'pingback_useragent', $client->useragent . ' -- WordPress/' . get_bloginfo( 'version' ), $client->useragent, $pingback_server_url, $pagelinkedto, $pagelinkedfrom );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // when set to true, this outputs debug messages by itself

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // When set to true, this outputs debug messages by itself.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $client->debug = false;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( $client->query( 'pingback.ping', $pagelinkedfrom, $pagelinkedto ) || ( isset( $client->error->code ) && 48 == $client->error->code ) ) { // Already registered

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 if ( $client->query( 'pingback.ping', $pagelinkedfrom, $pagelinkedto ) || ( isset( $client->error->code ) && 48 == $client->error->code ) ) { // Already registered.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 add_ping( $post, $pagelinkedto );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2960,15 +2966,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">        include_once( ABSPATH . WPINC . '/class-IXR.php' );

</span><span class="cx" style="display: block; padding: 0 10px">        include_once( ABSPATH . WPINC . '/class-wp-http-ixr-client.php' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // using a timeout of 3 seconds should be enough to cover slow servers

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Using a timeout of 3 seconds should be enough to cover slow servers.

</ins><span class="cx" style="display: block; padding: 0 10px">         $client             = new WP_HTTP_IXR_Client( $server, ( ( ! strlen( trim( $path ) ) || ( '/' == $path ) ) ? false : $path ) );

</span><span class="cx" style="display: block; padding: 0 10px">        $client->timeout    = 3;

</span><span class="cx" style="display: block; padding: 0 10px">        $client->useragent .= ' -- WordPress/' . get_bloginfo( 'version' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // when set to true, this outputs debug messages by itself

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // When set to true, this outputs debug messages by itself.

</ins><span class="cx" style="display: block; padding: 0 10px">         $client->debug = false;

</span><span class="cx" style="display: block; padding: 0 10px">        $home          = trailingslashit( home_url() );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        if ( ! $client->query( 'weblogUpdates.extendedPing', get_option( 'blogname' ), $home, get_bloginfo( 'rss2_url' ) ) ) { // then try a normal ping

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $client->query( 'weblogUpdates.extendedPing', get_option( 'blogname' ), $home, get_bloginfo( 'rss2_url' ) ) ) { // Then try a normal ping.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $client->query( 'weblogUpdates.ping', get_option( 'blogname' ), $home );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3006,7 +3012,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">-// Cache

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Cache.

</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">@@ -3085,7 +3091,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">-// Internal

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Internal.

</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">@@ -3316,7 +3322,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // If the user is logged in

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If the user is logged in.

</ins><span class="cx" style="display: block; padding: 0 10px">         $user = wp_get_current_user();

</span><span class="cx" style="display: block; padding: 0 10px">        if ( $user->exists() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( empty( $user->display_name ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3330,8 +3336,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! isset( $comment_data['_wp_unfiltered_html_comment'] )

</span><span class="cx" style="display: block; padding: 0 10px">                                || ! wp_verify_nonce( $comment_data['_wp_unfiltered_html_comment'], 'unfiltered-html-comment_' . $comment_post_ID )

</span><span class="cx" style="display: block; padding: 0 10px">                        ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                kses_remove_filters(); // start with a clean slate

-                               kses_init_filters(); // set up the filters

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         kses_remove_filters(); // Start with a clean slate.

+                               kses_init_filters();   // Set up the filters.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 remove_filter( 'pre_comment_content', 'wp_filter_post_kses' );

</span><span class="cx" style="display: block; padding: 0 10px">                                add_filter( 'pre_comment_content', 'wp_filter_kses' );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span></span></pre></div>

<a id="trunksrcwpincludescompatphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/compat.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/compat.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/compat.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,7 +6,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">  * @access private

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// If gettext isn't available

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// If gettext isn't available.

</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! function_exists( '_' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">        function _( $string ) {

</span><span class="cx" style="display: block; padding: 0 10px">                return $string;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -326,11 +326,11 @@

</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// random_int was introduced in PHP 7.0

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// random_int() was introduced in PHP 7.0.

</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! function_exists( 'random_int' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">        require ABSPATH . WPINC . '/random_compat/random.php';

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// sodium_crypto_box was introduced in PHP 7.2

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// sodium_crypto_box() was introduced in PHP 7.2.

</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! function_exists( 'sodium_crypto_box' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">        require ABSPATH . WPINC . '/sodium_compat/autoload.php';

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span></span></pre></div>

<a id="trunksrcwpincludescronphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/cron.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/cron.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/cron.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,7 +32,7 @@

<span class="cx" style="display: block; padding: 0 10px">  * @return bool True if event successfully scheduled. False for failure.

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function wp_schedule_single_event( $timestamp, $hook, $args = array() ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Make sure timestamp is a positive integer

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Make sure timestamp is a positive integer.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! is_numeric( $timestamp ) || $timestamp <= 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">@@ -142,7 +142,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        $event = apply_filters( 'schedule_event', $event );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // A plugin disallowed this event

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // A plugin disallowed this event.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! $event ) {

</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">@@ -186,7 +186,7 @@

<span class="cx" style="display: block; padding: 0 10px">  * @return bool True if event successfully scheduled. False for failure.

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function wp_schedule_event( $timestamp, $recurrence, $hook, $args = array() ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Make sure timestamp is a positive integer

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Make sure timestamp is a positive integer.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! is_numeric( $timestamp ) || $timestamp <= 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">@@ -214,7 +214,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        /** This filter is documented in wp-includes/cron.php */

</span><span class="cx" style="display: block; padding: 0 10px">        $event = apply_filters( 'schedule_event', $event );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // A plugin disallowed this event

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // A plugin disallowed this event.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! $event ) {

</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">@@ -251,7 +251,7 @@

<span class="cx" style="display: block; padding: 0 10px">  * @return bool True if event successfully rescheduled. False for failure.

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function wp_reschedule_event( $timestamp, $recurrence, $hook, $args = array() ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Make sure timestamp is a positive integer

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Make sure timestamp is a positive integer.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! is_numeric( $timestamp ) || $timestamp <= 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">@@ -307,7 +307,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                return $pre;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Now we assume something is wrong and fail to schedule

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Now we assume something is wrong and fail to schedule.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( 0 == $interval ) {

</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">@@ -341,7 +341,7 @@

<span class="cx" style="display: block; padding: 0 10px">  * @return bool True if event successfully unscheduled. False for failure.

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function wp_unschedule_event( $timestamp, $hook, $args = array() ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Make sure timestamp is a positive integer

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Make sure timestamp is a positive integer.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! is_numeric( $timestamp ) || $timestamp <= 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">@@ -398,8 +398,8 @@

<span class="cx" style="display: block; padding: 0 10px">  *                   unscheduling one or more events fail.

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function wp_clear_scheduled_hook( $hook, $args = array() ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Backward compatibility

-       // Previously this function took the arguments as discrete vars rather than an array like the rest of the API

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Backward compatibility.

+       // Previously, this function took the arguments as discrete vars rather than an array like the rest of the API.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! is_array( $args ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                _deprecated_argument( __FUNCTION__, '3.0.0', __( 'This argument has changed to an array to match the behavior of the other cron functions.' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $args = array_slice( func_get_args(), 1 );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -426,9 +426,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                return $pre;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // This logic duplicates wp_next_scheduled()

-       // It's required due to a scenario where wp_unschedule_event() fails due to update_option() failing,

-       // and, wp_next_scheduled() returns the same schedule in an infinite loop.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*

+        * This logic duplicates wp_next_scheduled().

+        * It's required due to a scenario where wp_unschedule_event() fails due to update_option() failing,

+        * and, wp_next_scheduled() returns the same schedule in an infinite loop.

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         $crons = _get_cron_array();

</span><span class="cx" style="display: block; padding: 0 10px">        if ( empty( $crons ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                return 0;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -648,12 +650,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $lock = 0;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // don't run if another process is currently running it or more than once every 60 sec.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Don't run if another process is currently running it or more than once every 60 sec.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( $lock + WP_CRON_LOCK_TIMEOUT > $gmt_time ) {

</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">-        //sanity check

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Sanity check.

</ins><span class="cx" style="display: block; padding: 0 10px">         $crons = wp_get_ready_cron_jobs();

</span><span class="cx" style="display: block; padding: 0 10px">        if ( empty( $crons ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                return false;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -676,7 +678,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                wp_redirect( add_query_arg( 'doing_wp_cron', $doing_wp_cron, wp_unslash( $_SERVER['REQUEST_URI'] ) ) );

</span><span class="cx" style="display: block; padding: 0 10px">                echo ' ';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // flush any buffers and send the headers

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Flush any buffers and send the headers.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_ob_end_flush_all();

</span><span class="cx" style="display: block; padding: 0 10px">                flush();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -743,7 +745,7 @@

<span class="cx" style="display: block; padding: 0 10px">  *                  events needed to be spawned), false if spawning fails for one or more events.

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function wp_cron() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Prevent infinite loops caused by lack of wp-cron.php

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Prevent infinite loops caused by lack of wp-cron.php.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( strpos( $_SERVER['REQUEST_URI'], '/wp-cron.php' ) !== false || ( defined( 'DISABLE_WP_CRON' ) && DISABLE_WP_CRON ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                return 0;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -923,7 +925,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">-// Private functions

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Private functions.

</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="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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/customize/class-wp-customize-nav-menu-setting.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -285,7 +285,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                )

</span><span class="cx" style="display: block; padding: 0 10px">                        );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // @todo add support for $args['hide_empty'] === true

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // @todo Add support for $args['hide_empty'] === true.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                return $menus;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span></span></pre></div>

<a id="trunksrcwpincludescustomizeclasswpcustomizethemessectionphp"></a>

<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-themes-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-themes-section.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/customize/class-wp-customize-themes-section.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,7 +72,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                ?>

</span><span class="cx" style="display: block; padding: 0 10px">                <li id="accordion-section-{{ data.id }}" class="theme-section">

</span><span class="cx" style="display: block; padding: 0 10px">                        <button type="button" class="customize-themes-section-title themes-section-{{ data.id }}">{{ data.title }}</button>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <?php if ( current_user_can( 'install_themes' ) || is_multisite() ) : // @todo: upload support ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <?php if ( current_user_can( 'install_themes' ) || is_multisite() ) : // @todo Upload support. ?>

</ins><span class="cx" style="display: block; padding: 0 10px">                         <?php endif; ?>

</span><span class="cx" style="display: block; padding: 0 10px">                        <div class="customize-themes-section themes-section-{{ data.id }} control-section-content themes-php">

</span><span class="cx" style="display: block; padding: 0 10px">                                <div class="theme-overlay" tabindex="0" role="dialog" aria-label="<?php esc_attr_e( 'Theme Details' ); ?>"></div>

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -164,7 +164,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @since 4.9.0

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        protected function filter_drawer_content_template() {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $feature_list = get_theme_feature_list( false ); // @todo: Use the .org API instead of the local core feature list. The .org API is currently outdated and will be reconciled when the .org themes directory is next redesigned.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $feature_list = get_theme_feature_list( false ); // @todo Use the .org API instead of the local core feature list. The .org API is currently outdated and will be reconciled when the .org themes directory is next redesigned.

</ins><span class="cx" style="display: block; padding: 0 10px">                 ?>

</span><span class="cx" style="display: block; padding: 0 10px">                <# if ( 'wporg' === data.action ) { #>

</span><span class="cx" style="display: block; padding: 0 10px">                        <div class="filter-drawer filter-details">

</span></span></pre></div>

<a id="trunksrcwpincludescustomizeclasswpcustomizeuploadcontrolphp"></a>

<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-upload-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-upload-control.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/customize/class-wp-customize-upload-control.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,9 +18,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public $type          = 'upload';

</span><span class="cx" style="display: block; padding: 0 10px">        public $mime_type     = '';

</span><span class="cx" style="display: block; padding: 0 10px">        public $button_labels = array();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        public $removed       = ''; // unused

-       public $context; // unused

-       public $extensions = array(); // unused

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public $removed       = '';   // Unused.

+       public $context;              // Unused.

+       public $extensions = array(); // Unused.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Refresh the parameters passed to the JavaScript via JSON.

</span></span></pre></div>

<a id="trunksrcwpincludesdefaultconstantsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/default-constants.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/default-constants.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/default-constants.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,7 +6,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Defines initial WordPress constants

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Defines initial WordPress constants.

</ins><span class="cx" style="display: block; padding: 0 10px">  *

</span><span class="cx" style="display: block; padding: 0 10px">  * @see wp_debug_mode()

</span><span class="cx" style="display: block; padding: 0 10px">  *

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -69,7 +69,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! defined( 'WP_CONTENT_DIR' ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                define( 'WP_CONTENT_DIR', ABSPATH . 'wp-content' ); // no trailing slash, full paths only - WP_CONTENT_URL is defined further down

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         define( 'WP_CONTENT_DIR', ABSPATH . 'wp-content' ); // No trailing slash, full paths only - WP_CONTENT_URL is defined further down.

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">        // Add define( 'WP_DEBUG', true ); to wp-config.php to enable display of notices during development.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,8 +77,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                define( 'WP_DEBUG', 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">-        // Add define( 'WP_DEBUG_DISPLAY', null ); to wp-config.php use the globally configured setting for

-       // display_errors and not force errors to be displayed. Use false to force display_errors off.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Add define( 'WP_DEBUG_DISPLAY', null ); to wp-config.php use the globally configured setting

+       // for 'display_errors' and not force errors to be displayed. Use false to force 'display_errors' off.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! defined( 'WP_DEBUG_DISPLAY' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                define( 'WP_DEBUG_DISPLAY', true );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,7 +115,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                define( 'SHORTINIT', 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">-        // Constants for features added to WP that should short-circuit their plugin implementations

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Constants for features added to WP that should short-circuit their plugin implementations.

</ins><span class="cx" style="display: block; padding: 0 10px">         define( 'WP_FEATURE_BETTER_PASSWORDS', 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">@@ -141,15 +141,15 @@

</span><span class="cx" style="display: 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">- * Defines plugin directory WordPress constants

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Defines plugin directory WordPress constants.

</ins><span class="cx" style="display: block; padding: 0 10px">  *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Defines must-use plugin directory constants, which may be overridden in the sunrise.php drop-in

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Defines must-use plugin directory constants, which may be overridden in the sunrise.php drop-in.

</ins><span class="cx" style="display: block; padding: 0 10px">  *

</span><span class="cx" style="display: block; padding: 0 10px">  * @since 3.0.0

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function wp_plugin_directory_constants() {

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! defined( 'WP_CONTENT_URL' ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                define( 'WP_CONTENT_URL', get_option( 'siteurl' ) . '/wp-content' ); // full url - WP_CONTENT_DIR is defined further up

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         define( 'WP_CONTENT_URL', get_option( 'siteurl' ) . '/wp-content' ); // Full URL - WP_CONTENT_DIR is defined further up.

</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">@@ -158,7 +158,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @since 2.6.0

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! defined( 'WP_PLUGIN_DIR' ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                define( 'WP_PLUGIN_DIR', WP_CONTENT_DIR . '/plugins' ); // full path, no trailing slash

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         define( 'WP_PLUGIN_DIR', WP_CONTENT_DIR . '/plugins' ); // Full path, no trailing slash.

</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">@@ -167,7 +167,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @since 2.6.0

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! defined( 'WP_PLUGIN_URL' ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                define( 'WP_PLUGIN_URL', WP_CONTENT_URL . '/plugins' ); // full url, no trailing slash

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         define( 'WP_PLUGIN_URL', WP_CONTENT_URL . '/plugins' ); // Full URL, no trailing slash.

</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">@@ -186,7 +186,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @since 2.8.0

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! defined( 'WPMU_PLUGIN_DIR' ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                define( 'WPMU_PLUGIN_DIR', WP_CONTENT_DIR . '/mu-plugins' ); // full path, no trailing slash

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         define( 'WPMU_PLUGIN_DIR', WP_CONTENT_DIR . '/mu-plugins' ); // Full path, no trailing slash.

</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">@@ -195,7 +195,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @since 2.8.0

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! defined( 'WPMU_PLUGIN_URL' ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                define( 'WPMU_PLUGIN_URL', WP_CONTENT_URL . '/mu-plugins' ); // full url, no trailing slash

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         define( 'WPMU_PLUGIN_URL', WP_CONTENT_URL . '/mu-plugins' ); // Full URL, no trailing slash.

</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">@@ -210,7 +210,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">- * Defines cookie related WordPress constants

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Defines cookie-related WordPress constants.

</ins><span class="cx" style="display: block; padding: 0 10px">  *

<span class="cx" style="display: block; padding: 0 10px">  * Defines constants after multisite is loaded.

</span><span class="cx" style="display: block; padding: 0 10px">  *

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -218,7 +218,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function wp_cookie_constants() {

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Used to guarantee unique hash cookies

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Used to guarantee unique hash cookies.

</ins><span class="cx" style="display: block; padding: 0 10px">          *

</span><span class="cx" style="display: block; padding: 0 10px">         * @since 1.5.0

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -344,7 +344,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Defines functionality related WordPress constants

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Defines functionality-related WordPress constants.

</ins><span class="cx" style="display: block; padding: 0 10px">  *

</span><span class="cx" style="display: block; padding: 0 10px">  * @since 3.0.0

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -353,7 +353,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @since 2.5.0

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! defined( 'AUTOSAVE_INTERVAL' ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                define( 'AUTOSAVE_INTERVAL', 60 );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         define( 'AUTOSAVE_INTERVAL', MINUTE_IN_SECONDS );

</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">@@ -371,18 +371,18 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @since 3.3.0

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! defined( 'WP_CRON_LOCK_TIMEOUT' ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                define( 'WP_CRON_LOCK_TIMEOUT', 60 );  // In seconds

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         define( 'WP_CRON_LOCK_TIMEOUT', MINUTE_IN_SECONDS );

</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="cx" style="display: block; padding: 0 10px"> /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Defines templating related WordPress constants

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Defines templating-related WordPress constants.

</ins><span class="cx" style="display: block; padding: 0 10px">  *

</span><span class="cx" style="display: block; padding: 0 10px">  * @since 3.0.0

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function wp_templating_constants() {

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Filesystem path to the current active template directory

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Filesystem path to the current active template directory.

</ins><span class="cx" style="display: block; padding: 0 10px">          *

</span><span class="cx" style="display: block; padding: 0 10px">         * @since 1.5.0

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -389,7 +389,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        define( 'TEMPLATEPATH', get_template_directory() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Filesystem path to the current active template stylesheet directory

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Filesystem path to the current active template stylesheet directory.

</ins><span class="cx" style="display: block; padding: 0 10px">          *

</span><span class="cx" style="display: block; padding: 0 10px">         * @since 2.1.0

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span></span></pre></div>

<a id="trunksrcwpincludesdefaultfiltersphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/default-filters.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/default-filters.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/default-filters.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,7 +12,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">  * @package WordPress

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Strip, trim, kses, special chars for string saves

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Strip, trim, kses, special chars for string saves.

</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( array( 'pre_term_name', 'pre_comment_author_name', 'pre_link_name', 'pre_link_target', 'pre_link_rel', 'pre_user_display_name', 'pre_user_first_name', 'pre_user_last_name', 'pre_user_nickname' ) as $filter ) {

</span><span class="cx" style="display: block; padding: 0 10px">        add_filter( $filter, 'sanitize_text_field' );

</span><span class="cx" style="display: block; padding: 0 10px">        add_filter( $filter, 'wp_filter_kses' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,7 +19,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        add_filter( $filter, '_wp_specialchars', 30 );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Strip, kses, special chars for string display

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Strip, kses, special chars for string display.

</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( array( 'term_name', 'comment_author_name', 'link_name', 'link_target', 'link_rel', 'user_display_name', 'user_first_name', 'user_last_name', 'user_nickname' ) as $filter ) {

</span><span class="cx" style="display: block; padding: 0 10px">        if ( is_admin() ) {

<span class="cx" style="display: block; padding: 0 10px">                // These are expensive. Run only on admin pages for defense in depth.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,12 +29,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">        add_filter( $filter, '_wp_specialchars', 30 );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Kses only for textarea saves

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Kses only for textarea saves.

</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( array( 'pre_term_description', 'pre_link_description', 'pre_link_notes', 'pre_user_description' ) as $filter ) {

</span><span class="cx" style="display: block; padding: 0 10px">        add_filter( $filter, 'wp_filter_kses' );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Kses only for textarea admin displays

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Kses only for textarea admin displays.

</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_admin() ) {

</span><span class="cx" style="display: block; padding: 0 10px">        foreach ( array( 'term_description', 'link_description', 'link_notes', 'user_description' ) as $filter ) {

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( $filter, 'wp_kses_data' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,7 +42,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        add_filter( 'comment_text', 'wp_kses_post' );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Email saves

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Email saves.

</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( array( 'pre_comment_author_email', 'pre_user_email' ) as $filter ) {

</span><span class="cx" style="display: block; padding: 0 10px">        add_filter( $filter, 'trim' );

</span><span class="cx" style="display: block; padding: 0 10px">        add_filter( $filter, 'sanitize_email' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,7 +49,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        add_filter( $filter, 'wp_filter_kses' );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Email admin display

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Email admin display.

</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( array( 'comment_author_email', 'user_email' ) as $filter ) {

</span><span class="cx" style="display: block; padding: 0 10px">        add_filter( $filter, 'sanitize_email' );

</span><span class="cx" style="display: block; padding: 0 10px">        if ( is_admin() ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,7 +57,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Save URL

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Save URL.

</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( array(

</span><span class="cx" style="display: block; padding: 0 10px">        'pre_comment_author_url',

</span><span class="cx" style="display: block; padding: 0 10px">        'pre_user_url',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,7 +71,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        add_filter( $filter, 'wp_filter_kses' );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Display URL

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Display URL.

</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( array( 'user_url', 'link_url', 'link_image', 'link_rss', 'comment_url', 'post_guid' ) as $filter ) {

</span><span class="cx" style="display: block; padding: 0 10px">        if ( is_admin() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( $filter, 'wp_strip_all_tags' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,28 +82,28 @@

</span><span class="cx" style="display: 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">-// Slugs

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Slugs.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'pre_term_slug', 'sanitize_title' );

</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_insert_post_data', '_wp_customize_changeset_filter_insert_post_data', 10, 2 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Keys

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Keys.

</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( array( 'pre_post_type', 'pre_post_status', 'pre_post_comment_status', 'pre_post_ping_status' ) as $filter ) {

</span><span class="cx" style="display: block; padding: 0 10px">        add_filter( $filter, 'sanitize_key' );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Mime types

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Mime types.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'pre_post_mime_type', 'sanitize_mime_type' );

</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'post_mime_type', 'sanitize_mime_type' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Meta

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Meta.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'register_meta_args', '_wp_register_meta_args_whitelist', 10, 2 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Post meta

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Post meta.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'added_post_meta', 'wp_cache_set_posts_last_changed' );

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'updated_post_meta', 'wp_cache_set_posts_last_changed' );

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'deleted_post_meta', 'wp_cache_set_posts_last_changed' );

</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 meta

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Term meta.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'added_term_meta', 'wp_cache_set_terms_last_changed' );

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'updated_term_meta', 'wp_cache_set_terms_last_changed' );

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'deleted_term_meta', 'wp_cache_set_terms_last_changed' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -116,12 +116,12 @@

</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'delete_term_metadata_by_mid', 'wp_check_term_meta_support_prefilter' );

</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'update_term_metadata_cache', 'wp_check_term_meta_support_prefilter' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Comment meta

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Comment meta.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'added_comment_meta', 'wp_cache_set_comments_last_changed' );

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'updated_comment_meta', 'wp_cache_set_comments_last_changed' );

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'deleted_comment_meta', 'wp_cache_set_comments_last_changed' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Places to balance tags on input

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Places to balance tags on input.

</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( array( 'content_save_pre', 'excerpt_save_pre', 'comment_save_pre', 'pre_comment_content' ) as $filter ) {

</span><span class="cx" style="display: block; padding: 0 10px">        add_filter( $filter, 'convert_invalid_entities' );

</span><span class="cx" style="display: block; padding: 0 10px">        add_filter( $filter, 'balanceTags', 50 );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -137,13 +137,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">        add_filter( $filter, 'esc_html' );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Format WordPress

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Format WordPress.

</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( array( 'the_content', 'the_title', 'wp_title' ) as $filter ) {

</span><span class="cx" style="display: block; padding: 0 10px">        add_filter( $filter, 'capital_P_dangit', 11 );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'comment_text', 'capital_P_dangit', 31 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Format titles

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Format titles.

</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( array( 'single_post_title', 'single_cat_title', 'single_tag_title', 'single_month_title', 'nav_menu_attr_title', 'nav_menu_description' ) as $filter ) {

</span><span class="cx" style="display: block; padding: 0 10px">        add_filter( $filter, 'wptexturize' );

</span><span class="cx" style="display: block; padding: 0 10px">        add_filter( $filter, 'strip_tags' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -157,14 +157,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">        add_filter( $filter, 'shortcode_unautop' );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Format for RSS

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Format for RSS.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'term_name_rss', 'convert_chars' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Pre save hierarchy

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Pre save hierarchy.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_insert_post_parent', 'wp_check_post_hierarchy_for_loops', 10, 2 );

</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_update_term_parent', 'wp_check_term_hierarchy_for_loops', 10, 3 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Display filters

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Display filters.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'the_title', 'wptexturize' );

</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'the_title', 'convert_chars' );

</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'the_title', 'trim' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -209,7 +209,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'widget_text_content', 'shortcode_unautop' );

<span class="cx" style="display: block; padding: 0 10px"> add_filter( 'widget_text_content', 'do_shortcode', 11 ); // Runs after wpautop(); note that $post global will be null when shortcodes run.

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// RSS filters

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// RSS filters.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'the_title_rss', 'strip_tags' );

</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'the_title_rss', 'ent2ncr', 8 );

</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'the_title_rss', 'esc_html' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -226,17 +226,17 @@

</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'the_author', 'ent2ncr', 8 );

</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'the_guid', 'esc_url' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Email filters

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Email filters.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_mail', 'wp_staticize_emoji_for_email' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Mark site as no longer fresh

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Mark site as no longer fresh.

</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( array( 'publish_post', 'publish_page', 'wp_ajax_save-widget', 'wp_ajax_widgets-order', 'customize_save_after' ) as $action ) {

</span><span class="cx" style="display: block; padding: 0 10px">        add_action( $action, '_delete_option_fresh_site', 0 );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Misc filters

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Misc filters.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'option_ping_sites', 'privacy_ping_filter' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-add_filter( 'option_blog_charset', '_wp_specialchars' ); // IMPORTANT: This must not be wp_specialchars() or esc_html() or it'll cause an infinite loop

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_filter( 'option_blog_charset', '_wp_specialchars' ); // IMPORTANT: This must not be wp_specialchars() or esc_html() or it'll cause an infinite loop.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'option_blog_charset', '_canonical_charset' );

</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'option_home', '_config_wp_home' );

</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'option_siteurl', '_config_wp_siteurl' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -276,7 +276,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'auth_cookie_valid', 'rest_cookie_collect_status' );

</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'rest_authentication_errors', 'rest_cookie_check_errors', 100 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Actions

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Actions.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_head', '_wp_render_title_tag', 1 );

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_head', 'wp_enqueue_scripts', 1 );

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_head', 'wp_resource_hints', 2 );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -308,7 +308,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        add_action( 'wp_head', 'wp_no_robots' );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Login actions

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Login actions.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'login_head', 'wp_resource_hints', 8 );

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'login_head', 'wp_print_head_scripts', 9 );

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'login_head', 'print_admin_styles', 9 );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -316,22 +316,22 @@

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'login_footer', 'wp_print_footer_scripts', 20 );

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'login_init', 'send_frame_options_header', 10, 0 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Feed Generator Tags

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Feed generator tags.

</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( array( 'rss2_head', 'commentsrss2_head', 'rss_head', 'rdf_header', 'atom_head', 'comments_atom_head', 'opml_head', 'app_head' ) as $action ) {

</span><span class="cx" style="display: block; padding: 0 10px">        add_action( $action, 'the_generator' );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Feed Site Icon

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Feed Site Icon.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'atom_head', 'atom_site_icon' );

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'rss2_head', 'rss2_site_icon' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// WP Cron

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// WP Cron.

</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! defined( 'DOING_CRON' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">        add_action( 'init', 'wp_cron' );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// 2 Actions 2 Furious

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// 2 Actions 2 Furious.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'do_feed_rdf', 'do_feed_rdf', 10, 0 );

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'do_feed_rss', 'do_feed_rss', 10, 0 );

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'do_feed_rss2', 'do_feed_rss2', 10, 1 );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -359,7 +359,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'admin_init', 'send_frame_options_header', 10, 0 );

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'welcome_panel', 'wp_welcome_panel' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Privacy

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Privacy.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'user_request_action_confirmed', '_wp_privacy_account_request_confirmed' );

<span class="cx" style="display: block; padding: 0 10px"> add_action( 'user_request_action_confirmed', '_wp_privacy_send_request_confirmation_notification', 12 ); // After request marked as completed.

</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_privacy_personal_data_exporters', 'wp_register_comment_personal_data_exporter' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -369,7 +369,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'init', 'wp_schedule_delete_old_privacy_export_files' );

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_privacy_delete_old_export_files', 'wp_privacy_delete_old_export_files' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Cron tasks

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Cron tasks.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_scheduled_delete', 'wp_scheduled_delete' );

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_scheduled_auto_draft_delete', 'wp_delete_auto_drafts' );

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'importer_scheduled_cleanup', 'wp_delete_attachment' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -376,35 +376,35 @@

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'upgrader_scheduled_cleanup', 'wp_delete_attachment' );

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'delete_expired_transients', 'delete_expired_transients' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Navigation menu actions

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Navigation menu actions.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'delete_post', '_wp_delete_post_menu_item' );

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'delete_term', '_wp_delete_tax_menu_item', 10, 3 );

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'transition_post_status', '_wp_auto_add_pages_to_menu', 10, 3 );

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'delete_post', '_wp_delete_customize_changeset_dependent_auto_drafts' );

</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 Thumbnail CSS class filtering

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Post Thumbnail CSS class filtering.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'begin_fetch_post_thumbnail_html', '_wp_post_thumbnail_class_filter_add' );

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'end_fetch_post_thumbnail_html', '_wp_post_thumbnail_class_filter_remove' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Redirect Old Slugs

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Redirect old slugs.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'template_redirect', 'wp_old_slug_redirect' );

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'post_updated', 'wp_check_for_changed_slugs', 12, 3 );

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'attachment_updated', 'wp_check_for_changed_slugs', 12, 3 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Redirect Old Dates

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Redirect old dates.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'post_updated', 'wp_check_for_changed_dates', 12, 3 );

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'attachment_updated', 'wp_check_for_changed_dates', 12, 3 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Nonce check for Post Previews

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Nonce check for post previews.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'init', '_show_post_preview' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Output JS to reset window.name for previews

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Output JS to reset window.name for previews.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_head', 'wp_post_preview_js', 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">-// Timezone

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Timezone.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'pre_option_gmt_offset', 'wp_timezone_override_offset' );

</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 Color Schemes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Admin color schemes.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'admin_init', 'register_admin_color_schemes', 1 );

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'admin_color_scheme_picker', 'admin_color_scheme_picker' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -414,15 +414,15 @@

<span class="cx" style="display: block; padding: 0 10px"> // This option no longer exists; tell plugins we always support auto-embedding.

</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'pre_option_embed_autourls', '__return_true' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Default settings for heartbeat

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Default settings for heartbeat.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'heartbeat_settings', 'wp_heartbeat_settings' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Check if the user is logged out

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Check if the user is logged out.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'admin_enqueue_scripts', 'wp_auth_check_load' );

</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'heartbeat_send', 'wp_auth_check' );

</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'heartbeat_nopriv_send', 'wp_auth_check' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Default authentication filters

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Default authentication filters.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'authenticate', 'wp_authenticate_username_password', 20, 3 );

</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'authenticate', 'wp_authenticate_email_password', 20, 3 );

</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'authenticate', 'wp_authenticate_spam_check', 99 );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -451,9 +451,9 @@

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'parse_request', 'rest_api_loaded' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Filters formerly mixed into wp-includes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Filters formerly mixed into wp-includes.

</ins><span class="cx" style="display: block; padding: 0 10px">  */

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Theme

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Theme.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_loaded', '_custom_header_background_just_in_time' );

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_head', '_custom_logo_header_styles' );

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'plugins_loaded', '_wp_customize_include' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -462,23 +462,23 @@

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'delete_attachment', '_delete_attachment_theme_mod' );

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'transition_post_status', '_wp_keep_alive_customize_changeset_dependent_auto_drafts', 20, 3 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Calendar widget cache

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Calendar widget cache.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'save_post', 'delete_get_calendar_cache' );

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'delete_post', 'delete_get_calendar_cache' );

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'update_option_start_of_week', 'delete_get_calendar_cache' );

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'update_option_gmt_offset', 'delete_get_calendar_cache' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Author

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Author.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'transition_post_status', '__clear_multi_author_cache' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Post

-add_action( 'init', 'create_initial_post_types', 0 ); // highest priority

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Post.

+add_action( 'init', 'create_initial_post_types', 0 ); // Highest priority.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'admin_menu', '_add_post_type_submenus' );

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'before_delete_post', '_reset_front_page_settings_for_post' );

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_trash_post', '_reset_front_page_settings_for_post' );

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'change_locale', 'create_initial_post_types' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Post Formats

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Post Formats.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'request', '_post_format_request' );

</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'term_link', '_post_format_link', 10, 3 );

</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'get_post_format', '_post_format_get_term' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -485,11 +485,11 @@

</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'get_terms', '_post_format_get_terms', 10, 3 );

</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_get_object_terms', '_post_format_wp_get_object_terms' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// KSES

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// KSES.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'init', 'kses_init' );

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'set_current_user', 'kses_init' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Script Loader

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Script Loader.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_default_scripts', 'wp_default_scripts' );

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_default_scripts', 'wp_default_packages' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -509,29 +509,29 @@

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_default_styles', 'wp_default_styles' );

</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'style_loader_src', 'wp_style_loader_src', 10, 2 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Taxonomy

-add_action( 'init', 'create_initial_taxonomies', 0 ); // highest priority

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Taxonomy.

+add_action( 'init', 'create_initial_taxonomies', 0 ); // Highest priority.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'change_locale', 'create_initial_taxonomies' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Canonical

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Canonical.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'template_redirect', 'redirect_canonical' );

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'template_redirect', 'wp_redirect_admin_locations', 1000 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Shortcodes

-add_filter( 'the_content', 'do_shortcode', 11 ); // AFTER wpautop()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Shortcodes.

+add_filter( 'the_content', 'do_shortcode', 11 ); // AFTER wpautop().

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Media

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Media.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_playlist_scripts', 'wp_playlist_scripts' );

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'customize_controls_enqueue_scripts', 'wp_plupload_default_settings' );

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'plugins_loaded', '_wp_add_additional_image_sizes', 0 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Nav menu

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Nav menu.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'nav_menu_item_id', '_nav_menu_item_id_use_once', 10, 2 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Widgets

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Widgets.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'init', 'wp_widgets_init', 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">-// Admin Bar

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Admin Bar.

</ins><span class="cx" style="display: block; padding: 0 10px"> // Don't remove. Wrong way to disable.

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'template_redirect', '_wp_admin_bar_init', 0 );

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'admin_init', '_wp_admin_bar_init' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -540,12 +540,12 @@

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_footer', 'wp_admin_bar_render', 1000 );

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'in_admin_header', 'wp_admin_bar_render', 0 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Former admin filters that can also be hooked on the front end

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Former admin filters that can also be hooked on the front end.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'media_buttons', 'media_buttons' );

</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'image_send_to_editor', 'image_add_caption', 20, 8 );

</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'media_send_to_editor', 'image_media_send_to_editor', 10, 3 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Embeds

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Embeds.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'rest_api_init', 'wp_oembed_register_route' );

</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'rest_pre_serve_request', '_oembed_rest_pre_serve_request', 10, 4 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -580,7 +580,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'oembed_response_data', 'get_oembed_response_data_rich', 10, 4 );

</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'pre_oembed_result', 'wp_filter_pre_oembed_result', 10, 3 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Capabilities

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Capabilities.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'user_has_cap', 'wp_maybe_grant_install_languages_cap', 1 );

</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'user_has_cap', 'wp_maybe_grant_resume_extensions_caps', 1 );

</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'user_has_cap', 'wp_maybe_grant_site_health_caps', 1, 4 );

</span></span></pre></div>

<a id="trunksrcwpincludesdeprecatedphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/deprecated.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/deprecated.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/deprecated.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -270,7 +270,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> function user_can_delete_post($user_id, $post_id, $blog_id = 1) {

</span><span class="cx" style="display: block; padding: 0 10px">        _deprecated_function( __FUNCTION__, '2.0.0', 'current_user_can()' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // right now if one can edit, one can delete

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Right now if one can edit, one can delete.

</ins><span class="cx" style="display: block; padding: 0 10px">         return user_can_edit_post($user_id, $post_id, $blog_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">@@ -327,7 +327,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> function user_can_edit_post_comments($user_id, $post_id, $blog_id = 1) {

</span><span class="cx" style="display: block; padding: 0 10px">        _deprecated_function( __FUNCTION__, '2.0.0', 'current_user_can()' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // right now if one can edit a post, one can edit comments made on it

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Right now if one can edit a post, one can edit comments made on it.

</ins><span class="cx" style="display: block; padding: 0 10px">         return user_can_edit_post($user_id, $post_id, $blog_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">@@ -346,7 +346,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> function user_can_delete_post_comments($user_id, $post_id, $blog_id = 1) {

</span><span class="cx" style="display: block; padding: 0 10px">        _deprecated_function( __FUNCTION__, '2.0.0', 'current_user_can()' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // right now if one can edit comments, one can delete comments

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Right now if one can edit comments, one can delete comments.

</ins><span class="cx" style="display: block; padding: 0 10px">         return user_can_edit_post_comments($user_id, $post_id, $blog_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">@@ -931,7 +931,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $orderby = substr($orderby, 1);

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        if ( $category == -1 ) //get_bookmarks uses '' to signify all categories

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $category == -1 ) // get_bookmarks() uses '' to signify all categories.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $category = '';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $results = get_bookmarks(array('category' => $category, 'orderby' => $orderby, 'order' => $order, 'show_updated' => $show_updated, 'limit' => $limit));

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -976,7 +976,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $row->link_image != null && $show_images ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( strpos($row->link_image, 'http') !== false )

</span><span class="cx" style="display: block; padding: 0 10px">                                $output .= "<img src=\"$row->link_image\" $alt $title />";

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        else // If it's a relative path

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 else // If it's a relative path.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $output .= "<img src=\"" . get_option('siteurl') . "$row->link_image\" $alt $title />";

</span><span class="cx" style="display: block; padding: 0 10px">                } else {

</span><span class="cx" style="display: block; padding: 0 10px">                        $output .= $name;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -995,7 +995,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $output .= "$after\n";

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        } // end while

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } // End while.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( !$echo )

</span><span class="cx" style="display: block; padding: 0 10px">                return $output;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1019,7 +1019,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $order = strtolower($order);

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Handle link category sorting

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Handle link category sorting.

</ins><span class="cx" style="display: block; padding: 0 10px">         $direction = 'ASC';

</span><span class="cx" style="display: block; padding: 0 10px">        if ( '_' == substr($order,0,1) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $direction = 'DESC';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1031,17 +1031,17 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $cats = get_categories(array('type' => 'link', 'orderby' => $order, 'order' => $direction, 'hierarchical' => 0));

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Display each category

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Display each category.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( $cats ) {

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( (array) $cats as $cat ) {

<span class="cx" style="display: block; padding: 0 10px">                        // Handle each category.

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Display the category name

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Display the category name.

</ins><span class="cx" style="display: block; padding: 0 10px">                         echo '  <li id="linkcat-' . $cat->term_id . '" class="linkcat"><h2>' . apply_filters('link_category', $cat->name ) . "</h2>\n\t<ul>\n";

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Call get_links() with all the appropriate params

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Call get_links() with all the appropriate params.

</ins><span class="cx" style="display: block; padding: 0 10px">                         get_links($cat->term_id, '<li>', "</li>", "\n", true, 'name', 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">-                        // Close the last category

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Close the last category.

</ins><span class="cx" style="display: block; padding: 0 10px">                         echo "\n\t</ul>\n</li>\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">@@ -1254,7 +1254,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">        $chain = '';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /** TODO: consult hierarchy */

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /** TODO: Consult hierarchy */

</ins><span class="cx" style="display: block; padding: 0 10px">         $cat_ids = get_all_category_ids();

</span><span class="cx" style="display: block; padding: 0 10px">        foreach ( (array) $cat_ids as $cat_id ) {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $cat_id == $id )

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1877,11 +1877,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $file = get_attached_file( $post->ID );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( !$fullsize && $src = wp_get_attachment_thumb_url( $post->ID ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // We have a thumbnail desired, specified and existing

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // We have a thumbnail desired, specified and existing.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $src_file = wp_basename($src);

</span><span class="cx" style="display: block; padding: 0 10px">        } elseif ( wp_attachment_is_image( $post->ID ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // We have an image without a thumbnail

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // We have an image without a thumbnail.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $src = wp_get_attachment_url( $post->ID );

</span><span class="cx" style="display: block; padding: 0 10px">                $src_file = & $file;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2113,7 +2113,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function register_sidebar_widget($name, $output_callback, $classname = '', ...$params) {

</span><span class="cx" style="display: block; padding: 0 10px">        _deprecated_function( __FUNCTION__, '2.8.0', 'wp_register_sidebar_widget()' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Compat

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Compat.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( is_array( $name ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( count( $name ) === 3 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $name = sprintf( $name[0], $name[2] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2167,7 +2167,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function register_widget_control($name, $control_callback, $width = '', $height = '', ...$params) {

</span><span class="cx" style="display: block; padding: 0 10px">        _deprecated_function( __FUNCTION__, '2.8.0', 'wp_register_widget_control()' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Compat

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Compat.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( is_array( $name ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( count( $name ) === 3 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $name = sprintf( $name[0], $name[2] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2271,7 +2271,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        if ( !empty($meta_key) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);

</span><span class="cx" style="display: block; padding: 0 10px">                $user = wp_cache_get($user_id, 'users');

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check the cached user object

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check the cached user object.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( false !== $user && isset($user->$meta_key) )

</span><span class="cx" style="display: block; padding: 0 10px">                        $metas = array($user->$meta_key);

</span><span class="cx" style="display: block; padding: 0 10px">                else

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2394,7 +2394,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        if ( $add )

</span><span class="cx" style="display: block; padding: 0 10px">                add_theme_support( 'automatic-feed-links' );

</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">-                remove_action( 'wp_head', 'feed_links_extra', 3 ); // Just do this yourself in 3.0+

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         remove_action( 'wp_head', 'feed_links_extra', 3 ); // Just do this yourself in 3.0+.

</ins><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2670,11 +2670,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">        _deprecated_function( __FUNCTION__, '3.3.0' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $posts = get_boundary_post($in_same_cat, $excluded_categories, $start);

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // If there is no post stop.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If there is no post, stop.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( empty($posts) )

</span><span class="cx" style="display: block; padding: 0 10px">                return;

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Even though we limited get_posts to return only 1 item it still returns an array of objects.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Even though we limited get_posts() to return only 1 item it still returns an array of objects.

</ins><span class="cx" style="display: block; padding: 0 10px">         $post = $posts[0];

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( empty($post->post_title) )

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3596,7 +3596,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        _deprecated_function( __FUNCTION__, '4.3.0', 'format_for_editor()' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( !empty($output) )

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $output = htmlspecialchars($output, ENT_NOQUOTES, get_option( 'blog_charset' ) ); // convert only < > &

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $output = htmlspecialchars($output, ENT_NOQUOTES, get_option( 'blog_charset' ) ); // Convert only '< > &'.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Filters the text before it is formatted for the HTML editor.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3673,7 +3673,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        if ( false == $file_path )

</span><span class="cx" style="display: block; padding: 0 10px">                return $headers;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // GET request - write it to the supplied filename

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // GET request - write it to the supplied filename.

</ins><span class="cx" style="display: block; padding: 0 10px">         $out_fp = fopen($file_path, 'w');

</span><span class="cx" style="display: block; padding: 0 10px">        if ( !$out_fp )

</span><span class="cx" style="display: block; padding: 0 10px">                return $headers;

</span></span></pre></div>

<a id="trunksrcwpincludeserrorprotectionphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/error-protection.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/error-protection.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/error-protection.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,7 +3,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">  * Error Protection API: Functions

</span><span class="cx" style="display: block; padding: 0 10px">  *

</span><span class="cx" style="display: block; padding: 0 10px">  * @package WordPress

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since   5.2.0

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.2.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="trunksrcwpincludesfeedatomcommentsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/feed-atom-comments.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/feed-atom-comments.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/feed-atom-comments.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -45,19 +45,19 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        <updated><?php echo get_feed_build_date( 'Y-m-d\TH:i:s\Z' ); ?></updated>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php if ( is_singular() ) { ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php if ( is_singular() ) : ?>

</ins><span class="cx" style="display: block; padding: 0 10px">         <link rel="alternate" type="<?php bloginfo_rss( 'html_type' ); ?>" href="<?php comments_link_feed(); ?>" />

</span><span class="cx" style="display: block; padding: 0 10px">        <link rel="self" type="application/atom+xml" href="<?php echo esc_url( get_post_comments_feed_link( '', 'atom' ) ); ?>" />

</span><span class="cx" style="display: block; padding: 0 10px">        <id><?php echo esc_url( get_post_comments_feed_link( '', 'atom' ) ); ?></id>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php } elseif ( is_search() ) { ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php elseif ( is_search() ) : ?>

</ins><span class="cx" style="display: block; padding: 0 10px">         <link rel="alternate" type="<?php bloginfo_rss( 'html_type' ); ?>" href="<?php echo home_url() . '?s=' . get_search_query(); ?>" />

</span><span class="cx" style="display: block; padding: 0 10px">        <link rel="self" type="application/atom+xml" href="<?php echo get_search_comments_feed_link( '', 'atom' ); ?>" />

</span><span class="cx" style="display: block; padding: 0 10px">        <id><?php echo get_search_comments_feed_link( '', 'atom' ); ?></id>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php } else { ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php else : ?>

</ins><span class="cx" style="display: block; padding: 0 10px">         <link rel="alternate" type="<?php bloginfo_rss( 'html_type' ); ?>" href="<?php bloginfo_rss( 'url' ); ?>" />

</span><span class="cx" style="display: block; padding: 0 10px">        <link rel="self" type="application/atom+xml" href="<?php bloginfo_rss( 'comments_atom_url' ); ?>" />

</span><span class="cx" style="display: block; padding: 0 10px">        <id><?php bloginfo_rss( 'comments_atom_url' ); ?></id>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php } ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php endif; ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> <?php

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Fires at the end of the Atom comment feed header.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,12 +67,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">        do_action( 'comments_atom_head' );

</span><span class="cx" style="display: block; padding: 0 10px"> ?>

</span><span class="cx" style="display: block; padding: 0 10px"> <?php

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( have_comments() ) :

-       while ( have_comments() ) :

-               the_comment();

-               $comment_post    = get_post( $comment->comment_post_ID );

-               $GLOBALS['post'] = $comment_post;

-               ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+while ( have_comments() ) :

+       the_comment();

+       $comment_post    = get_post( $comment->comment_post_ID );

+       $GLOBALS['post'] = $comment_post;

+       ?>

</ins><span class="cx" style="display: block; padding: 0 10px">         <entry>

</span><span class="cx" style="display: block; padding: 0 10px">                <title>

</span><span class="cx" style="display: block; padding: 0 10px">                <?php

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -87,8 +86,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        printf( ent2ncr( __( 'By: %s' ) ), get_comment_author_rss() );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">                ?>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        </title>

-                       <link rel="alternate" href="<?php comment_link(); ?>" type="<?php bloginfo_rss( 'html_type' ); ?>" />

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         </title>

+               <link rel="alternate" href="<?php comment_link(); ?>" type="<?php bloginfo_rss( 'html_type' ); ?>" />

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                <author>

</span><span class="cx" style="display: block; padding: 0 10px">                        <name><?php comment_author_rss(); ?></name>

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -102,37 +101,43 @@

</span><span class="cx" style="display: block; padding: 0 10px">                <id><?php comment_guid(); ?></id>

</span><span class="cx" style="display: block; padding: 0 10px">                <updated><?php echo mysql2date( 'Y-m-d\TH:i:s\Z', get_comment_time( 'Y-m-d H:i:s', true, false ), false ); ?></updated>

</span><span class="cx" style="display: block; padding: 0 10px">                <published><?php echo mysql2date( 'Y-m-d\TH:i:s\Z', get_comment_time( 'Y-m-d H:i:s', true, false ), false ); ?></published>

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 <?php if ( post_password_required( $comment_post ) ) : ?>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <content type="html" xml:base="<?php comment_link(); ?>"><![CDATA[<?php echo get_the_password_form(); ?>]]></content>

-       <?php else : // post pass ?>

-               <content type="html" xml:base="<?php comment_link(); ?>"><![CDATA[<?php comment_text(); ?>]]></content>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <content type="html" xml:base="<?php comment_link(); ?>"><![CDATA[<?php echo get_the_password_form(); ?>]]></content>

+               <?php else : ?>

+                       <content type="html" xml:base="<?php comment_link(); ?>"><![CDATA[<?php comment_text(); ?>]]></content>

+               <?php endif; // End if post_password_required(). ?>

+

</ins><span class="cx" style="display: block; padding: 0 10px">                 <?php

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        endif; // post pass

-       // Return comment threading information (https://www.ietf.org/rfc/rfc4685.txt)

-       if ( $comment->comment_parent == 0 ) : // This comment is top level

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Return comment threading information (https://www.ietf.org/rfc/rfc4685.txt).

+               if ( $comment->comment_parent == 0 ) : // This comment is top-level.

+                       ?>

+                       <thr:in-reply-to ref="<?php the_guid(); ?>" href="<?php the_permalink_rss(); ?>" type="<?php bloginfo_rss( 'html_type' ); ?>" />

+                       <?php

+               else : // This comment is in reply to another comment.

+                       $parent_comment = get_comment( $comment->comment_parent );

+                       /*

+                        * The rel attribute below and the id tag above should be GUIDs,

+                        * but WP doesn't create them for comments (unlike posts).

+                        * Either way, it's more important that they both use the same system.

+                        */

+                       ?>

+                       <thr:in-reply-to ref="<?php comment_guid( $parent_comment ); ?>" href="<?php echo get_comment_link( $parent_comment ); ?>" type="<?php bloginfo_rss( 'html_type' ); ?>" />

+                       <?php

+               endif;

+

+               /**

+                * Fires at the end of each Atom comment feed item.

+                *

+                * @since 2.2.0

+                *

+                * @param int $comment_id      ID of the current comment.

+                * @param int $comment_post_id ID of the post the current comment is connected to.

+                */

+               do_action( 'comment_atom_entry', $comment->comment_ID, $comment_post->ID );

</ins><span class="cx" style="display: block; padding: 0 10px">                 ?>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        <thr:in-reply-to ref="<?php the_guid(); ?>" href="<?php the_permalink_rss(); ?>" type="<?php bloginfo_rss( 'html_type' ); ?>" />

-               <?php

-       else : // This comment is in reply to another comment

-               $parent_comment = get_comment( $comment->comment_parent );

-               // The rel attribute below and the id tag above should be GUIDs, but WP doesn't create them for comments (unlike posts). Either way, it's more important that they both use the same system

-               ?>

-               <thr:in-reply-to ref="<?php comment_guid( $parent_comment ); ?>" href="<?php echo get_comment_link( $parent_comment ); ?>" type="<?php bloginfo_rss( 'html_type' ); ?>" />

-               <?php

-endif;

-       /**

-        * Fires at the end of each Atom comment feed item.

-        *

-        * @since 2.2.0

-        *

-        * @param int $comment_id      ID of the current comment.

-        * @param int $comment_post_id ID of the post the current comment is connected to.

-        */

-       do_action( 'comment_atom_entry', $comment->comment_ID, $comment_post->ID );

-       ?>

</del><span class="cx" style="display: block; padding: 0 10px">         </entry>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <?php

-       endwhile;

-endif;

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php

+endwhile;

</ins><span class="cx" style="display: block; padding: 0 10px"> ?>

</span><span class="cx" style="display: block; padding: 0 10px"> </feed>

</span></span></pre></div>

<a id="trunksrcwpincludesfeedatomphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/feed-atom.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/feed-atom.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/feed-atom.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,8 +50,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">        <entry>

</span><span class="cx" style="display: block; padding: 0 10px">                <author>

</span><span class="cx" style="display: block; padding: 0 10px">                        <name><?php the_author(); ?></name>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <?php $author_url = get_the_author_meta( 'url' ); if ( ! empty( $author_url ) ) : ?>

-                       <uri><?php the_author_meta( 'url' ); ?></uri>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <?php

+                       $author_url = get_the_author_meta( 'url' );

+                       if ( ! empty( $author_url ) ) :

+                               ?>

+                               <uri><?php the_author_meta( 'url' ); ?></uri>

</ins><span class="cx" style="display: block; padding: 0 10px">                                 <?php

</span><span class="cx" style="display: block; padding: 0 10px">                        endif;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -63,18 +66,24 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        do_action( 'atom_author' );

</span><span class="cx" style="display: block; padding: 0 10px">                        ?>

</span><span class="cx" style="display: block; padding: 0 10px">                </author>

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 <title type="<?php html_type_rss(); ?>"><![CDATA[<?php the_title_rss(); ?>]]></title>

</span><span class="cx" style="display: block; padding: 0 10px">                <link rel="alternate" type="<?php bloginfo_rss( 'html_type' ); ?>" href="<?php the_permalink_rss(); ?>" />

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 <id><?php the_guid(); ?></id>

</span><span class="cx" style="display: block; padding: 0 10px">                <updated><?php echo get_post_modified_time( 'Y-m-d\TH:i:s\Z', true ); ?></updated>

</span><span class="cx" style="display: block; padding: 0 10px">                <published><?php echo get_post_time( 'Y-m-d\TH:i:s\Z', true ); ?></published>

</span><span class="cx" style="display: block; padding: 0 10px">                <?php the_category_rss( 'atom' ); ?>

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 <summary type="<?php html_type_rss(); ?>"><![CDATA[<?php the_excerpt_rss(); ?>]]></summary>

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 <?php if ( ! get_option( 'rss_use_excerpt' ) ) : ?>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <content type="<?php html_type_rss(); ?>" xml:base="<?php the_permalink_rss(); ?>"><![CDATA[<?php the_content_feed( 'atom' ); ?>]]></content>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <content type="<?php html_type_rss(); ?>" xml:base="<?php the_permalink_rss(); ?>"><![CDATA[<?php the_content_feed( 'atom' ); ?>]]></content>

</ins><span class="cx" style="display: block; padding: 0 10px">                 <?php endif; ?>

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 <?php

</span><span class="cx" style="display: block; padding: 0 10px">                atom_enclosure();

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 /**

<span class="cx" style="display: block; padding: 0 10px">                 * Fires at the end of each Atom feed item.

</span><span class="cx" style="display: block; padding: 0 10px">                 *

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,9 +93,9 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( get_comments_number() || comments_open() ) :

</span><span class="cx" style="display: block; padding: 0 10px">                        ?>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <link rel="replies" type="<?php bloginfo_rss( 'html_type' ); ?>" href="<?php the_permalink_rss(); ?>#comments" thr:count="<?php echo get_comments_number(); ?>"/>

-               <link rel="replies" type="application/atom+xml" href="<?php echo esc_url( get_post_comments_feed_link( 0, 'atom' ) ); ?>" thr:count="<?php echo get_comments_number(); ?>"/>

-               <thr:total><?php echo get_comments_number(); ?></thr:total>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <link rel="replies" type="<?php bloginfo_rss( 'html_type' ); ?>" href="<?php the_permalink_rss(); ?>#comments" thr:count="<?php echo get_comments_number(); ?>"/>

+                       <link rel="replies" type="application/atom+xml" href="<?php echo esc_url( get_post_comments_feed_link( 0, 'atom' ) ); ?>" thr:count="<?php echo get_comments_number(); ?>"/>

+                       <thr:total><?php echo get_comments_number(); ?></thr:total>

</ins><span class="cx" style="display: block; padding: 0 10px">                 <?php endif; ?>

</span><span class="cx" style="display: block; padding: 0 10px">        </entry>

</span><span class="cx" style="display: block; padding: 0 10px">        <?php endwhile; ?>

</span></span></pre></div>

<a id="trunksrcwpincludesfeedrdfphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/feed-rdf.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/feed-rdf.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/feed-rdf.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -74,15 +74,18 @@

</span><span class="cx" style="display: block; padding: 0 10px"> <item rdf:about="<?php the_permalink_rss(); ?>">

</span><span class="cx" style="display: block; padding: 0 10px">        <title><?php the_title_rss(); ?></title>

</span><span class="cx" style="display: block; padding: 0 10px">        <link><?php the_permalink_rss(); ?></link>

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

+       <dc:creator><![CDATA[<?php the_author(); ?>]]></dc:creator>

</ins><span class="cx" style="display: block; padding: 0 10px">         <dc:date><?php echo mysql2date( 'Y-m-d\TH:i:s\Z', $post->post_date_gmt, false ); ?></dc:date>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        <dc:creator><![CDATA[<?php the_author(); ?>]]></dc:creator>

</del><span class="cx" style="display: block; padding: 0 10px">         <?php the_category_rss( 'rdf' ); ?>

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">         <?php if ( get_option( 'rss_use_excerpt' ) ) : ?>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        <description><![CDATA[<?php the_excerpt_rss(); ?>]]></description>

-<?php else : ?>

-       <description><![CDATA[<?php the_excerpt_rss(); ?>]]></description>

-       <content:encoded><![CDATA[<?php the_content_feed( 'rdf' ); ?>]]></content:encoded>

-<?php endif; ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <description><![CDATA[<?php the_excerpt_rss(); ?>]]></description>

+       <?php else : ?>

+               <description><![CDATA[<?php the_excerpt_rss(); ?>]]></description>

+               <content:encoded><![CDATA[<?php the_content_feed( 'rdf' ); ?>]]></content:encoded>

+       <?php endif; ?>

+

</ins><span class="cx" style="display: block; padding: 0 10px">         <?php

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Fires at the end of each RDF feed item.

</span></span></pre></div>

<a id="trunksrcwpincludesfeedrssphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/feed-rss.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/feed-rss.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/feed-rss.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,7 +17,6 @@

</span><span class="cx" style="display: block; padding: 0 10px">        <lastBuildDate><?php echo get_feed_build_date( 'D, d M Y H:i:s +0000' ); ?></lastBuildDate>

</span><span class="cx" style="display: block; padding: 0 10px">        <docs>http://backend.userland.com/rss092</docs>

</span><span class="cx" style="display: block; padding: 0 10px">        <language><?php bloginfo_rss( 'language' ); ?></language>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-

</del><span class="cx" style="display: block; padding: 0 10px">         <?php

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Fires at the end of the RSS Feed Header.

</span></span></pre></div>

<a id="trunksrcwpincludesfeedrss2commentsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/feed-rss2-comments.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/feed-rss2-comments.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/feed-rss2-comments.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -70,53 +70,52 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        do_action( 'commentsrss2_head' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        if ( have_comments() ) :

-               while ( have_comments() ) :

-                       the_comment();

-                       $comment_post    = get_post( $comment->comment_post_ID );

-                       $GLOBALS['post'] = $comment_post;

-                       ?>

-                       <item>

-                               <title>

-                               <?php

-                               if ( ! is_singular() ) {

-                                       $title = get_the_title( $comment_post->ID );

-                                       /** This filter is documented in wp-includes/feed.php */

-                                       $title = apply_filters( 'the_title_rss', $title );

-                                       /* translators: Individual comment title. 1: Post title, 2: Comment author name. */

-                                       printf( ent2ncr( __( 'Comment on %1$s by %2$s' ) ), $title, get_comment_author_rss() );

-                               } else {

-                                       /* translators: Comment author title. %s: Comment author name. */

-                                       printf( ent2ncr( __( 'By: %s' ) ), get_comment_author_rss() );

-                               }

-                               ?>

-                               </title>

-                               <link><?php comment_link(); ?></link>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ while ( have_comments() ) :

+               the_comment();

+               $comment_post    = get_post( $comment->comment_post_ID );

+               $GLOBALS['post'] = $comment_post;

+               ?>

+       <item>

+               <title>

+               <?php

+               if ( ! is_singular() ) {

+                       $title = get_the_title( $comment_post->ID );

+                       /** This filter is documented in wp-includes/feed.php */

+                       $title = apply_filters( 'the_title_rss', $title );

+                       /* translators: Individual comment title. 1: Post title, 2: Comment author name. */

+                       printf( ent2ncr( __( 'Comment on %1$s by %2$s' ) ), $title, get_comment_author_rss() );

+               } else {

+                       /* translators: Comment author title. %s: Comment author name. */

+                       printf( ent2ncr( __( 'By: %s' ) ), get_comment_author_rss() );

+               }

+               ?>

+               </title>

+               <link><?php comment_link(); ?></link>

+

</ins><span class="cx" style="display: block; padding: 0 10px">                 <dc:creator><![CDATA[<?php echo get_comment_author_rss(); ?>]]></dc:creator>

</span><span class="cx" style="display: block; padding: 0 10px">                <pubDate><?php echo mysql2date( 'D, d M Y H:i:s +0000', get_comment_time( 'Y-m-d H:i:s', true, false ), false ); ?></pubDate>

</span><span class="cx" style="display: block; padding: 0 10px">                <guid isPermaLink="false"><?php comment_guid(); ?></guid>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <?php if ( post_password_required( $comment_post ) ) : ?>

-               <description><?php echo ent2ncr( __( 'Protected Comments: Please enter your password to view comments.' ) ); ?></description>

-               <content:encoded><![CDATA[<?php echo get_the_password_form(); ?>]]></content:encoded>

-               <?php else : // post pass ?>

-               <description><![CDATA[<?php comment_text_rss(); ?>]]></description>

-               <content:encoded><![CDATA[<?php comment_text(); ?>]]></content:encoded>

-                       <?php

-               endif; // post pass

-                       /**

-                        * Fires at the end of each RSS2 comment feed item.

-                        *

-                        * @since 2.1.0

-                        *

-                        * @param int $comment->comment_ID The ID of the comment being displayed.

-                        * @param int $comment_post->ID    The ID of the post the comment is connected to.

-                        */

-                       do_action( 'commentrss2_item', $comment->comment_ID, $comment_post->ID );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

+               <?php if ( post_password_required( $comment_post ) ) : ?>

+                       <description><?php echo ent2ncr( __( 'Protected Comments: Please enter your password to view comments.' ) ); ?></description>

+                       <content:encoded><![CDATA[<?php echo get_the_password_form(); ?>]]></content:encoded>

+               <?php else : ?>

+                       <description><![CDATA[<?php comment_text_rss(); ?>]]></description>

+                       <content:encoded><![CDATA[<?php comment_text(); ?>]]></content:encoded>

+               <?php endif; // End if post_password_required(). ?>

+

+               <?php

+               /**

+                * Fires at the end of each RSS2 comment feed item.

+                *

+                * @since 2.1.0

+                *

+                * @param int $comment->comment_ID The ID of the comment being displayed.

+                * @param int $comment_post->ID    The ID of the post the comment is connected to.

+                */

+               do_action( 'commentrss2_item', $comment->comment_ID, $comment_post->ID );

</ins><span class="cx" style="display: block; padding: 0 10px">                 ?>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        </item>

-                       <?php

-               endwhile;

-endif;

-       ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ </item>

+       <?php endwhile; ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> </channel>

</span><span class="cx" style="display: block; padding: 0 10px"> </rss>

</span></span></pre></div>

<a id="trunksrcwpincludesfeedrss2php"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/feed-rss2.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/feed-rss2.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/feed-rss2.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -89,29 +89,33 @@

</span><span class="cx" style="display: block; padding: 0 10px">                <title><?php the_title_rss(); ?></title>

</span><span class="cx" style="display: block; padding: 0 10px">                <link><?php the_permalink_rss(); ?></link>

</span><span class="cx" style="display: block; padding: 0 10px">                <?php if ( get_comments_number() || comments_open() ) : ?>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <comments><?php comments_link_feed(); ?></comments>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <comments><?php comments_link_feed(); ?></comments>

</ins><span class="cx" style="display: block; padding: 0 10px">                 <?php endif; ?>

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

+               <dc:creator><![CDATA[<?php the_author(); ?>]]></dc:creator>

</ins><span class="cx" style="display: block; padding: 0 10px">                 <pubDate><?php echo mysql2date( 'D, d M Y H:i:s +0000', get_post_time( 'Y-m-d H:i:s', true ), false ); ?></pubDate>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <dc:creator><![CDATA[<?php the_author(); ?>]]></dc:creator>

</del><span class="cx" style="display: block; padding: 0 10px">                 <?php the_category_rss( 'rss2' ); ?>

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                <guid isPermaLink="false"><?php the_guid(); ?></guid>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <guid isPermaLink="false"><?php the_guid(); ?></guid>

</del><span class="cx" style="display: block; padding: 0 10px">                 <?php if ( get_option( 'rss_use_excerpt' ) ) : ?>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <description><![CDATA[<?php the_excerpt_rss(); ?>]]></description>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <description><![CDATA[<?php the_excerpt_rss(); ?>]]></description>

</ins><span class="cx" style="display: block; padding: 0 10px">                 <?php else : ?>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <description><![CDATA[<?php the_excerpt_rss(); ?>]]></description>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <description><![CDATA[<?php the_excerpt_rss(); ?>]]></description>

</ins><span class="cx" style="display: block; padding: 0 10px">                         <?php $content = get_the_content_feed( 'rss2' ); ?>

</span><span class="cx" style="display: block; padding: 0 10px">                        <?php if ( strlen( $content ) > 0 ) : ?>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <content:encoded><![CDATA[<?php echo $content; ?>]]></content:encoded>

-       <?php else : ?>

-               <content:encoded><![CDATA[<?php the_excerpt_rss(); ?>]]></content:encoded>

-       <?php endif; ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <content:encoded><![CDATA[<?php echo $content; ?>]]></content:encoded>

+                       <?php else : ?>

+                               <content:encoded><![CDATA[<?php the_excerpt_rss(); ?>]]></content:encoded>

+                       <?php endif; ?>

</ins><span class="cx" style="display: block; padding: 0 10px">                 <?php endif; ?>

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 <?php if ( get_comments_number() || comments_open() ) : ?>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <wfw:commentRss><?php echo esc_url( get_post_comments_feed_link( null, 'rss2' ) ); ?></wfw:commentRss>

-               <slash:comments><?php echo get_comments_number(); ?></slash:comments>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <wfw:commentRss><?php echo esc_url( get_post_comments_feed_link( null, 'rss2' ) ); ?></wfw:commentRss>

+                       <slash:comments><?php echo get_comments_number(); ?></slash:comments>

</ins><span class="cx" style="display: block; padding: 0 10px">                 <?php endif; ?>

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 <?php rss_enclosure(); ?>

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 <?php

</span><span class="cx" style="display: block; padding: 0 10px">                /**

<span class="cx" style="display: block; padding: 0 10px">                 * Fires at the end of each RSS2 feed item.

</span></span></pre></div>

<a id="trunksrcwpincludesfeedphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/feed.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/feed.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/feed.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -475,7 +475,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        foreach ( (array) $val as $enc ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $enclosure = explode( "\n", $enc );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // only get the first element, e.g. audio/mpeg from 'audio/mpeg mpga mp2 mp3'

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Only get the first element, e.g. 'audio/mpeg' from 'audio/mpeg mpga mp2 mp3'.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $t    = preg_split( '/[ \t]/', trim( $enclosure[2] ) );

</span><span class="cx" style="display: block; padding: 0 10px">                                $type = $t[0];

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -763,7 +763,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $feed->set_sanitize_class( 'WP_SimplePie_Sanitize_KSES' );

</span><span class="cx" style="display: block; padding: 0 10px">        // We must manually overwrite $feed->sanitize because SimplePie's

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // constructor sets it before we have a chance to set the sanitization class

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // constructor sets it before we have a chance to set the sanitization class.

</ins><span class="cx" style="display: block; padding: 0 10px">         $feed->sanitize = new WP_SimplePie_Sanitize_KSES();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $feed->set_cache_class( 'WP_Feed_Cache' );

</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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/formatting.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -123,7 +123,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $default_no_texturize_tags       = array( 'pre', 'code', 'kbd', 'style', 'script', 'tt' );

</span><span class="cx" style="display: block; padding: 0 10px">                $default_no_texturize_shortcodes = array( 'code' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // if a plugin has provided an autocorrect array, use it

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If a plugin has provided an autocorrect array, use it.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( isset( $wp_cockneyreplace ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $cockney        = array_keys( $wp_cockneyreplace );

</span><span class="cx" style="display: block; padding: 0 10px">                        $cockneyreplace = array_values( $wp_cockneyreplace );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -130,7 +130,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                } else {

</span><span class="cx" style="display: block; padding: 0 10px">                        /*

</span><span class="cx" style="display: block; padding: 0 10px">                         * translators: This is a comma-separated list of words that defy the syntax of quotations in normal use,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                         * for example...  'We do not have enough words yet' ... is a typical quoted phrase.  But when we write

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                  * for example... 'We do not have enough words yet'... is a typical quoted phrase. But when we write

</ins><span class="cx" style="display: block; padding: 0 10px">                          * lines of code 'til we have enough of 'em, then we need to insert apostrophes instead of quotes.

</span><span class="cx" style="display: block; padding: 0 10px">                         */

</span><span class="cx" style="display: block; padding: 0 10px">                        $cockney = explode(

</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">                        $dynamic['/\'(?=\d\d(?:\Z|(?![%\d]|[.,]\d)))/'] = $apos_flag;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Quoted Numbers like '0.42'

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Quoted numbers like '0.42'.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( "'" !== $opening_single_quote && "'" !== $closing_single_quote ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $dynamic[ '/(?<=\A|' . $spaces . ')\'(\d[.,\d]*)\'/' ] = $open_sq_flag . '$1' . $closing_single_quote;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -191,7 +191,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $dynamic[ '/(?<=\A|[([{"\-]|&lt;|' . $spaces . ')\'/' ] = $open_sq_flag;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Apostrophe in a word.  No spaces, double apostrophes, or other punctuation.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Apostrophe in a word. No spaces, double apostrophes, or other punctuation.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( "'" !== $apos ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $dynamic[ '/(?<!' . $spaces . ')\'(?!\Z|[.,:;!?"\'(){}[\]\-]|&[lg]t;|' . $spaces . ')/' ] = $apos_flag;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -200,7 +200,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $dynamic_replacements['apos'] = array_values( $dynamic );

</span><span class="cx" style="display: block; padding: 0 10px">                $dynamic                      = array();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Quoted Numbers like "42"

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Quoted numbers like "42".

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( '"' !== $opening_quote && '"' !== $closing_quote ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $dynamic[ '/(?<=\A|' . $spaces . ')"(\d[.,\d]*)"/' ] = $open_q_flag . '$1' . $closing_quote;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -214,7 +214,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $dynamic_replacements['quote'] = array_values( $dynamic );

</span><span class="cx" style="display: block; padding: 0 10px">                $dynamic                       = array();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Dashes and spaces

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Dashes and spaces.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $dynamic['/---/'] = $em_dash;

</span><span class="cx" style="display: block; padding: 0 10px">                $dynamic[ '/(?<=^|' . $spaces . ')--(?=$|' . $spaces . ')/' ] = $em_dash;

</span><span class="cx" style="display: block; padding: 0 10px">                $dynamic['/(?<!xn)--/']                                       = $en_dash;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -224,7 +224,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $dynamic_replacements['dash'] = array_values( $dynamic );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Must do this every time in case plugins use these filters in a context sensitive manner

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Must do this every time in case plugins use these filters in a context sensitive manner.

</ins><span class="cx" style="display: block; padding: 0 10px">         /**

<span class="cx" style="display: block; padding: 0 10px">         * Filters the list of HTML elements not to texturize.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -271,7 +271,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                _wptexturize_pushpop_element( $curl, $no_texturize_tags_stack, $no_texturize_tags );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                } elseif ( '' === trim( $curl ) ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // This is a newline between delimiters.  Performance improves when we check this.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // This is a newline between delimiters. Performance improves when we check this.

</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">                } elseif ( '[' === $first && $found_shortcodes && 1 === preg_match( '/^' . $shortcode_regex . '$/', $curl ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -285,7 +285,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                continue;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                } elseif ( empty( $no_texturize_shortcodes_stack ) && empty( $no_texturize_tags_stack ) ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // This is neither a delimiter, nor is this content inside of no_texturize pairs.  Do texturize.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // This is neither a delimiter, nor is this content inside of no_texturize pairs. Do texturize.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $curl = str_replace( $static_characters, $static_replacements, $curl );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -304,7 +304,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                $curl = preg_replace( $dynamic_characters['dash'], $dynamic_replacements['dash'], $curl );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // 9x9 (times), but never 0x9999

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // 9x9 (times), but never 0x9999.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( 1 === preg_match( '/(?<=\d)x\d/', $curl ) ) {

<span class="cx" style="display: block; padding: 0 10px">                                // Searching for a digit is 10 times more expensive than for the x, so we avoid doing this one!

</span><span class="cx" style="display: block; padding: 0 10px">                                $curl = preg_replace( '/\b(\d(?(?<=0)[\d\.,]+|[\d\.,]*))x(\d[\d\.,]*)\b/', '$1&#215;$2', $curl );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -348,7 +348,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                } elseif ( 0 !== $key && 0 === substr_count( $sentence, $close_quote ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $sentence = preg_replace( $quote_pattern, $flag, $sentence, -1, $count );

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( $count > 1 ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // This sentence appears to have multiple closing quotes.  Attempt Vulcan logic.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // This sentence appears to have multiple closing quotes. Attempt Vulcan logic.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $sentence = preg_replace( $flag_no_digit, $close_quote, $sentence, -1, $count2 );

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( 0 === $count2 ) {

<span class="cx" style="display: block; padding: 0 10px">                                        // Try looking for a quote followed by a period.

</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">                                $sentence = str_replace( $flag, $close_quote, $sentence );

</span><span class="cx" style="display: block; padding: 0 10px">                                $sentence = preg_replace( $prime_pattern, $prime, $sentence );

</span><span class="cx" style="display: block; padding: 0 10px">                        } else {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // No closing quotes found.  Just run primes pattern.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // No closing quotes found. Just run primes pattern.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $sentence = preg_replace( $prime_pattern, $prime, $sentence );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                } else {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -428,10 +428,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $opening_tag ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        /*

</span><span class="cx" style="display: block; padding: 0 10px">                         * This disables texturize until we find a closing tag of our type

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                         * (e.g. <pre>) even if there was invalid nesting before that

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                  * (e.g. <pre>) even if there was invalid nesting before that.

</ins><span class="cx" style="display: block; padding: 0 10px">                          *

</span><span class="cx" style="display: block; padding: 0 10px">                         * Example: in the case <pre>sadsadasd</code>"baba"</pre>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                         *          "baba" won't be texturize

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                  *          "baba" won't be texturized.

</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">                        array_push( $stack, $tag );

</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">                foreach ( $pee_parts as $pee_part ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $start = strpos( $pee_part, '<pre' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Malformed html?

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Malformed HTML?

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( $start === false ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $pee .= $pee_part;

</span><span class="cx" style="display: block; padding: 0 10px">                                continue;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -493,7 +493,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $pee .= $last_pee;

</span><span class="cx" style="display: block; padding: 0 10px">        }

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Change multiple  s into two line breaks, which will turn into paragraphs.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Change multiple  's into two line breaks, which will turn into paragraphs.

</ins><span class="cx" style="display: block; padding: 0 10px">         $pee = preg_replace( '|<br\s*/?>\s*<br\s*/?>|', "\n\n", $pee );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $allblocks = '(?:table|thead|tfoot|caption|col|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|form|map|area|blockquote|address|math|style|p|h[1-6]|hr|fieldset|legend|section|article|aside|hgroup|header|footer|nav|figure|figcaption|details|menu|summary)';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -676,7 +676,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        .     '<'           // Find start of element.

</span><span class="cx" style="display: block; padding: 0 10px">                        .     '(?'          // Conditional expression follows.

<span class="cx" style="display: block; padding: 0 10px">                        .         $escaped  // Find end of escaped element.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        .     '|'           // ... else ...

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 .     '|'           // ...else...

</ins><span class="cx" style="display: block; padding: 0 10px">                         .         '[^>]*>?' // Find end of normal element.

</span><span class="cx" style="display: block; padding: 0 10px">                        .     ')'

</span><span class="cx" style="display: block; padding: 0 10px">                        . ')/';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -696,7 +696,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">  *

</span><span class="cx" style="display: block; padding: 0 10px">  * @staticvar string $html_regex

</span><span class="cx" style="display: block; padding: 0 10px">  *

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $shortcode_regex The result from _get_wptexturize_shortcode_regex().  Optional.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $shortcode_regex The result from _get_wptexturize_shortcode_regex(). Optional.

</ins><span class="cx" style="display: block; padding: 0 10px">  * @return string The regular expression

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function _get_wptexturize_split_regex( $shortcode_regex = '' ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -746,8 +746,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $tagregexp = "(?:$tagregexp)(?=[\\s\\]\\/])"; // Excerpt of get_shortcode_regex().

</span><span class="cx" style="display: block; padding: 0 10px">        // phpcs:disable Squiz.Strings.ConcatenationSpacing.PaddingFound -- don't remove regex indentation

</span><span class="cx" style="display: block; padding: 0 10px">        $regex =

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                '\['              // Find start of shortcode.

-               . '[\/\[]?'         // Shortcodes may begin with [/ or [[

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         '\['                // Find start of shortcode.

+               . '[\/\[]?'         // Shortcodes may begin with [/ or [[.

</ins><span class="cx" style="display: block; padding: 0 10px">                 . $tagregexp        // Only match registered shortcodes, because performance.

</span><span class="cx" style="display: block; padding: 0 10px">                . '(?:'

<span class="cx" style="display: block; padding: 0 10px">                .     '[^\[\]<>]+'  // Shortcodes do not contain other shortcodes. Quantifier critical.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -755,7 +755,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                .     '<[^\[\]>]*>' // HTML elements permitted. Prevents matching ] before >.

</span><span class="cx" style="display: block; padding: 0 10px">                . ')*+'             // Possessive critical.

</span><span class="cx" style="display: block; padding: 0 10px">                . '\]'              // Find end of shortcode.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                . '\]?';            // Shortcodes may end with ]]

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         . '\]?';            // Shortcodes may end with ]].

</ins><span class="cx" style="display: block; padding: 0 10px">         // phpcs:enable

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        return $regex;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -850,34 +850,34 @@

</span><span class="cx" style="display: block; padding: 0 10px">        // phpcs:disable Squiz.Strings.ConcatenationSpacing.PaddingFound,WordPress.WhiteSpace.PrecisionAlignment.Found -- don't remove regex indentation

</span><span class="cx" style="display: block; padding: 0 10px">        $pattern =

</span><span class="cx" style="display: block; padding: 0 10px">                '/'

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                . '<p>'                              // Opening paragraph

-               . '(?:' . $spaces . ')*+'            // Optional leading whitespace

-               . '('                                // 1: The shortcode

-               .     '\\['                          // Opening bracket

-               .     "($tagregexp)"                 // 2: Shortcode name

-               .     '(?![\\w-])'                   // Not followed by word character or hyphen

-                                                                                        // Unroll the loop: Inside the opening shortcode tag

-               .     '[^\\]\\/]*'                   // Not a closing bracket or forward slash

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         . '<p>'                              // Opening paragraph.

+               . '(?:' . $spaces . ')*+'            // Optional leading whitespace.

+               . '('                                // 1: The shortcode.

+               .     '\\['                          // Opening bracket.

+               .     "($tagregexp)"                 // 2: Shortcode name.

+               .     '(?![\\w-])'                   // Not followed by word character or hyphen.

+                                                                                        // Unroll the loop: Inside the opening shortcode tag.

+               .     '[^\\]\\/]*'                   // Not a closing bracket or forward slash.

</ins><span class="cx" style="display: block; padding: 0 10px">                 .     '(?:'

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                .         '\\/(?!\\])'               // A forward slash not followed by a closing bracket

-               .         '[^\\]\\/]*'               // Not a closing bracket or forward slash

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         .         '\\/(?!\\])'               // A forward slash not followed by a closing bracket.

+               .         '[^\\]\\/]*'               // Not a closing bracket or forward slash.

</ins><span class="cx" style="display: block; padding: 0 10px">                 .     ')*?'

</span><span class="cx" style="display: block; padding: 0 10px">                .     '(?:'

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                .         '\\/\\]'                   // Self closing tag and closing bracket

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         .         '\\/\\]'                   // Self closing tag and closing bracket.

</ins><span class="cx" style="display: block; padding: 0 10px">                 .     '|'

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                .         '\\]'                      // Closing bracket

-               .         '(?:'                      // Unroll the loop: Optionally, anything between the opening and closing shortcode tags

-               .             '[^\\[]*+'             // Not an opening bracket

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         .         '\\]'                      // Closing bracket.

+               .         '(?:'                      // Unroll the loop: Optionally, anything between the opening and closing shortcode tags.

+               .             '[^\\[]*+'             // Not an opening bracket.

</ins><span class="cx" style="display: block; padding: 0 10px">                 .             '(?:'

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                .                 '\\[(?!\\/\\2\\])' // An opening bracket not followed by the closing shortcode tag

-               .                 '[^\\[]*+'         // Not an opening bracket

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         .                 '\\[(?!\\/\\2\\])' // An opening bracket not followed by the closing shortcode tag.

+               .                 '[^\\[]*+'         // Not an opening bracket.

</ins><span class="cx" style="display: block; padding: 0 10px">                 .             ')*+'

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                .             '\\[\\/\\2\\]'         // Closing shortcode tag

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         .             '\\[\\/\\2\\]'         // Closing shortcode tag.

</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                . '(?:' . $spaces . ')*+'            // optional trailing whitespace

-               . '<\\/p>'                           // closing paragraph

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         . '(?:' . $spaces . ')*+'            // Optional trailing whitespace.

+               . '<\\/p>'                           // Closing paragraph.

</ins><span class="cx" style="display: block; padding: 0 10px">                 . '/';

</span><span class="cx" style="display: block; padding: 0 10px">        // phpcs:enable

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -915,7 +915,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                } elseif ( ( $c & 0xFE ) == 0xFC ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $n = 5; // 1111110b

</span><span class="cx" style="display: block; padding: 0 10px">                } else {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return false; // Does not match any model

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return false; // Does not match any model.

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px">                for ( $j = 0; $j < $n; $j++ ) { // n bytes matching 10bbbbbb follow ?

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ( ++$i == $length ) || ( ( ord( $str[ $i ] ) & 0xC0 ) != 0x80 ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -956,12 +956,12 @@

</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">-        // Don't bother if there are no specialchars - saves some processing

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Don't bother if there are no specialchars - saves some processing.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! preg_match( '/[&<>"\']/', $string ) ) {

</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"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Account for the previous behaviour of the function when the $quote_style is not an accepted value

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Account for the previous behaviour of the function when the $quote_style is not an accepted value.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( empty( $quote_style ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $quote_style = ENT_NOQUOTES;

</span><span class="cx" style="display: block; padding: 0 10px">        } elseif ( ! in_array( $quote_style, array( 0, 2, 3, 'single', 'double' ), true ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -968,7 +968,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $quote_style = ENT_QUOTES;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Store the site charset as a static to avoid multiple calls to wp_load_alloptions()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Store the site charset as a static to avoid multiple calls to wp_load_alloptions().

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! $charset ) {

</span><span class="cx" style="display: block; padding: 0 10px">                static $_charset = null;

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! isset( $_charset ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1034,12 +1034,12 @@

</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">-        // Don't bother if there are no entities - saves a lot of processing

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Don't bother if there are no entities - saves a lot of processing.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( strpos( $string, '&' ) === false ) {

</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"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Match the previous behaviour of _wp_specialchars() when the $quote_style is not an accepted value

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Match the previous behaviour of _wp_specialchars() when the $quote_style is not an accepted value.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( empty( $quote_style ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $quote_style = ENT_NOQUOTES;

</span><span class="cx" style="display: block; padding: 0 10px">        } elseif ( ! in_array( $quote_style, array( 0, 2, 3, 'single', 'double' ), true ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1046,7 +1046,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $quote_style = ENT_QUOTES;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // More complete than get_html_translation_table( HTML_SPECIALCHARS )

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // More complete than get_html_translation_table( HTML_SPECIALCHARS ).

</ins><span class="cx" style="display: block; padding: 0 10px">         $single      = array(

</span><span class="cx" style="display: block; padding: 0 10px">                '&#039;' => '\'',

</span><span class="cx" style="display: block; padding: 0 10px">                '&#x27;' => '\'',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1094,10 +1094,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $translation_preg = $others_preg;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Remove zero padding on numeric entities

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Remove zero padding on numeric entities.

</ins><span class="cx" style="display: block; padding: 0 10px">         $string = preg_replace( array_keys( $translation_preg ), array_values( $translation_preg ), $string );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Replace characters according to translation table

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Replace characters according to translation table.

</ins><span class="cx" style="display: block; padding: 0 10px">         return strtr( $string, $translation );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1120,7 +1120,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">-        // Store the site charset as a static to avoid multiple calls to get_option()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Store the site charset as a static to avoid multiple calls to get_option().

</ins><span class="cx" style="display: block; padding: 0 10px">         static $is_utf8 = null;

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! isset( $is_utf8 ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $is_utf8 = in_array( get_option( 'blog_charset' ), array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1129,23 +1129,23 @@

</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"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Check for support for utf8 in the installed PCRE library once and store the result in a static

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Check for support for utf8 in the installed PCRE library once and store the result in a static.

</ins><span class="cx" style="display: block; padding: 0 10px">         static $utf8_pcre = null;

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! isset( $utf8_pcre ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                // phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged

</span><span class="cx" style="display: block; padding: 0 10px">                $utf8_pcre = @preg_match( '/^./u', 'a' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // We can't demand utf8 in the PCRE installation, so just return the string in those cases

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // We can't demand utf8 in the PCRE installation, so just return the string in those cases.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! $utf8_pcre ) {

</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"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged -- preg_match fails when it encounters invalid UTF8 in $string

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged -- preg_match fails when it encounters invalid UTF8 in $string.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( 1 === @preg_match( '/^./us', $string ) ) {

</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"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Attempt to strip the bad chars if requested (not recommended)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Attempt to strip the bad chars if requested (not recommended).

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( $strip && function_exists( 'iconv' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                return iconv( 'utf-8', 'utf-8', $string );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1607,7 +1607,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( seems_utf8( $string ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $chars = array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Decompositions for Latin-1 Supplement

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Decompositions for Latin-1 Supplement.

</ins><span class="cx" style="display: block; padding: 0 10px">                         'ª' => 'a',

</span><span class="cx" style="display: block; padding: 0 10px">                        'º' => 'o',

</span><span class="cx" style="display: block; padding: 0 10px">                        'À' => 'A',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1672,7 +1672,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'þ' => 'th',

</span><span class="cx" style="display: block; padding: 0 10px">                        'ÿ' => 'y',

</span><span class="cx" style="display: block; padding: 0 10px">                        'Ø' => 'O',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Decompositions for Latin Extended-A

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Decompositions for Latin Extended-A.

</ins><span class="cx" style="display: block; padding: 0 10px">                         'Ā' => 'A',

</span><span class="cx" style="display: block; padding: 0 10px">                        'ā' => 'a',

</span><span class="cx" style="display: block; padding: 0 10px">                        'Ă' => 'A',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1801,22 +1801,22 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'Ž' => 'Z',

</span><span class="cx" style="display: block; padding: 0 10px">                        'ž' => 'z',

</span><span class="cx" style="display: block; padding: 0 10px">                        'ſ' => 's',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Decompositions for Latin Extended-B

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Decompositions for Latin Extended-B.

</ins><span class="cx" style="display: block; padding: 0 10px">                         'Ș' => 'S',

</span><span class="cx" style="display: block; padding: 0 10px">                        'ș' => 's',

</span><span class="cx" style="display: block; padding: 0 10px">                        'Ț' => 'T',

</span><span class="cx" style="display: block; padding: 0 10px">                        'ț' => 't',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Euro Sign

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Euro sign.

</ins><span class="cx" style="display: block; padding: 0 10px">                         '€' => 'E',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // GBP (Pound) Sign

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // GBP (Pound) sign.

</ins><span class="cx" style="display: block; padding: 0 10px">                         '£' => '',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Vowels with diacritic (Vietnamese)

-                       // unmarked

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Vowels with diacritic (Vietnamese).

+                       // Unmarked.

</ins><span class="cx" style="display: block; padding: 0 10px">                         'Ơ' => 'O',

</span><span class="cx" style="display: block; padding: 0 10px">                        'ơ' => 'o',

</span><span class="cx" style="display: block; padding: 0 10px">                        'Ư' => 'U',

</span><span class="cx" style="display: block; padding: 0 10px">                        'ư' => 'u',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // grave accent

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Grave accent.

</ins><span class="cx" style="display: block; padding: 0 10px">                         'Ầ' => 'A',

</span><span class="cx" style="display: block; padding: 0 10px">                        'ầ' => 'a',

</span><span class="cx" style="display: block; padding: 0 10px">                        'Ằ' => 'A',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1831,7 +1831,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'ừ' => 'u',

</span><span class="cx" style="display: block; padding: 0 10px">                        'Ỳ' => 'Y',

</span><span class="cx" style="display: block; padding: 0 10px">                        'ỳ' => 'y',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // hook

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Hook.

</ins><span class="cx" style="display: block; padding: 0 10px">                         'Ả' => 'A',

</span><span class="cx" style="display: block; padding: 0 10px">                        'ả' => 'a',

</span><span class="cx" style="display: block; padding: 0 10px">                        'Ẩ' => 'A',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1856,7 +1856,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'ử' => 'u',

</span><span class="cx" style="display: block; padding: 0 10px">                        'Ỷ' => 'Y',

</span><span class="cx" style="display: block; padding: 0 10px">                        'ỷ' => 'y',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // tilde

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Tilde.

</ins><span class="cx" style="display: block; padding: 0 10px">                         'Ẫ' => 'A',

</span><span class="cx" style="display: block; padding: 0 10px">                        'ẫ' => 'a',

</span><span class="cx" style="display: block; padding: 0 10px">                        'Ẵ' => 'A',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1873,7 +1873,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'ữ' => 'u',

</span><span class="cx" style="display: block; padding: 0 10px">                        'Ỹ' => 'Y',

</span><span class="cx" style="display: block; padding: 0 10px">                        'ỹ' => 'y',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // acute accent

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Acute accent.

</ins><span class="cx" style="display: block; padding: 0 10px">                         'Ấ' => 'A',

</span><span class="cx" style="display: block; padding: 0 10px">                        'ấ' => 'a',

</span><span class="cx" style="display: block; padding: 0 10px">                        'Ắ' => 'A',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1886,7 +1886,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'ớ' => 'o',

</span><span class="cx" style="display: block; padding: 0 10px">                        'Ứ' => 'U',

</span><span class="cx" style="display: block; padding: 0 10px">                        'ứ' => 'u',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // dot below

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Dot below.

</ins><span class="cx" style="display: block; padding: 0 10px">                         'Ạ' => 'A',

</span><span class="cx" style="display: block; padding: 0 10px">                        'ạ' => 'a',

</span><span class="cx" style="display: block; padding: 0 10px">                        'Ậ' => 'A',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1911,15 +1911,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'ự' => 'u',

</span><span class="cx" style="display: block; padding: 0 10px">                        'Ỵ' => 'Y',

</span><span class="cx" style="display: block; padding: 0 10px">                        'ỵ' => 'y',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Vowels with diacritic (Chinese, Hanyu Pinyin)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Vowels with diacritic (Chinese, Hanyu Pinyin).

</ins><span class="cx" style="display: block; padding: 0 10px">                         'ɑ' => 'a',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // macron

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Macron.

</ins><span class="cx" style="display: block; padding: 0 10px">                         'Ǖ' => 'U',

</span><span class="cx" style="display: block; padding: 0 10px">                        'ǖ' => 'u',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // acute accent

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Acute accent.

</ins><span class="cx" style="display: block; padding: 0 10px">                         'Ǘ' => 'U',

</span><span class="cx" style="display: block; padding: 0 10px">                        'ǘ' => 'u',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // caron

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Caron.

</ins><span class="cx" style="display: block; padding: 0 10px">                         'Ǎ' => 'A',

</span><span class="cx" style="display: block; padding: 0 10px">                        'ǎ' => 'a',

</span><span class="cx" style="display: block; padding: 0 10px">                        'Ǐ' => 'I',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1930,12 +1930,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'ǔ' => 'u',

</span><span class="cx" style="display: block; padding: 0 10px">                        'Ǚ' => 'U',

</span><span class="cx" style="display: block; padding: 0 10px">                        'ǚ' => 'u',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // grave accent

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Grave accent.

</ins><span class="cx" style="display: block; padding: 0 10px">                         'Ǜ' => 'U',

</span><span class="cx" style="display: block; padding: 0 10px">                        'ǜ' => 'u',

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Used for locale-specific rules

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Used for locale-specific rules.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $locale = get_locale();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( 'de_DE' == $locale || 'de_DE_formal' == $locale || 'de_CH' == $locale || 'de_CH_informal' == $locale ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1963,7 +1963,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $string = strtr( $string, $chars );

</span><span class="cx" style="display: block; padding: 0 10px">        } else {

</span><span class="cx" style="display: block; padding: 0 10px">                $chars = array();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Assume ISO-8859-1 if not UTF-8

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Assume ISO-8859-1 if not UTF-8.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $chars['in'] = "\x80\x83\x8a\x8e\x9a\x9e"

</span><span class="cx" style="display: block; padding: 0 10px">                        . "\x9f\xa2\xa5\xb5\xc0\xc1\xc2"

</span><span class="cx" style="display: block; padding: 0 10px">                        . "\xc3\xc4\xc5\xc7\xc8\xc9\xca"

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2028,10 +2028,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Split the filename into a base and extension[s]

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Split the filename into a base and extension[s].

</ins><span class="cx" style="display: block; padding: 0 10px">         $parts = explode( '.', $filename );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Return if only one extension

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Return if only one extension.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( count( $parts ) <= 2 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                /**

<span class="cx" style="display: block; padding: 0 10px">                 * Filters a sanitized filename string.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2044,7 +2044,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                return apply_filters( 'sanitize_file_name', $filename, $filename_raw );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Process multiple extensions

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Process multiple extensions.

</ins><span class="cx" style="display: block; padding: 0 10px">         $filename  = array_shift( $parts );

</span><span class="cx" style="display: block; padding: 0 10px">        $extension = array_pop( $parts );

</span><span class="cx" style="display: block; padding: 0 10px">        $mimes     = get_allowed_mime_types();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2093,9 +2093,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $raw_username = $username;

</span><span class="cx" style="display: block; padding: 0 10px">        $username     = wp_strip_all_tags( $username );

</span><span class="cx" style="display: block; padding: 0 10px">        $username     = remove_accents( $username );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Kill octets

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Kill octets.

</ins><span class="cx" style="display: block; padding: 0 10px">         $username = preg_replace( '|%([a-fA-F0-9][a-fA-F0-9])|', '', $username );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $username = preg_replace( '/&.+?;/', '', $username ); // Kill entities

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Kill entities.

+       $username = preg_replace( '/&.+?;/', '', $username );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">        // If strict, reduce to ASCII for max portability.

</span><span class="cx" style="display: block; padding: 0 10px">        if ( $strict ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2103,7 +2104,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">        $username = trim( $username );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Consolidate contiguous whitespace

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Consolidate contiguous whitespace.

</ins><span class="cx" style="display: block; padding: 0 10px">         $username = preg_replace( '|\s+|', ' ', $username );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2229,27 +2230,27 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $title = strtolower( $title );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( 'save' == $context ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Convert nbsp, ndash and mdash to hyphens

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Convert &nbsp, &ndash, and &mdash to hyphens.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $title = str_replace( array( '%c2%a0', '%e2%80%93', '%e2%80%94' ), '-', $title );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Convert nbsp, ndash and mdash HTML entities to hyphens

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Convert &nbsp, &ndash, and &mdash HTML entities to hyphens.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $title = str_replace( array( '&nbsp;', '&#160;', '&ndash;', '&#8211;', '&mdash;', '&#8212;' ), '-', $title );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Convert forward slash to hyphen

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Convert forward slash to hyphen.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $title = str_replace( '/', '-', $title );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Strip these characters entirely

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Strip these characters entirely.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $title = str_replace(

</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">-                                // soft hyphens

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Soft hyphens.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '%c2%ad',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // iexcl and iquest

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // &iexcl and &iquest.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '%c2%a1',

</span><span class="cx" style="display: block; padding: 0 10px">                                '%c2%bf',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // angle quotes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Angle quotes.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '%c2%ab',

</span><span class="cx" style="display: block; padding: 0 10px">                                '%c2%bb',

</span><span class="cx" style="display: block; padding: 0 10px">                                '%e2%80%b9',

</span><span class="cx" style="display: block; padding: 0 10px">                                '%e2%80%ba',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // curly quotes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Curly quotes.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '%e2%80%98',

</span><span class="cx" style="display: block; padding: 0 10px">                                '%e2%80%99',

</span><span class="cx" style="display: block; padding: 0 10px">                                '%e2%80%9c',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2258,18 +2259,18 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                '%e2%80%9b',

</span><span class="cx" style="display: block; padding: 0 10px">                                '%e2%80%9e',

</span><span class="cx" style="display: block; padding: 0 10px">                                '%e2%80%9f',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // copy, reg, deg, hellip and trade

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // &copy, &reg, &deg, &hellip, and &trade.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '%c2%a9',

</span><span class="cx" style="display: block; padding: 0 10px">                                '%c2%ae',

</span><span class="cx" style="display: block; padding: 0 10px">                                '%c2%b0',

</span><span class="cx" style="display: block; padding: 0 10px">                                '%e2%80%a6',

</span><span class="cx" style="display: block; padding: 0 10px">                                '%e2%84%a2',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // acute accents

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Acute accents.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '%c2%b4',

</span><span class="cx" style="display: block; padding: 0 10px">                                '%cb%8a',

</span><span class="cx" style="display: block; padding: 0 10px">                                '%cc%81',

</span><span class="cx" style="display: block; padding: 0 10px">                                '%cd%81',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // grave accent, macron, caron

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Grave accent, macron, caron.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '%cc%80',

</span><span class="cx" style="display: block; padding: 0 10px">                                '%cc%84',

</span><span class="cx" style="display: block; padding: 0 10px">                                '%cc%8c',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2278,11 +2279,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $title

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Convert times to x

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Convert &times to 'x'.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $title = str_replace( '%c3%97', 'x', $title );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $title = preg_replace( '/&.+?;/', '', $title ); // kill entities

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Kill entities.

+       $title = preg_replace( '/&.+?;/', '', $title );

</ins><span class="cx" style="display: block; padding: 0 10px">         $title = str_replace( '.', '-', $title );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $title = preg_replace( '/[^%a-z0-9 _-]/', '', $title );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2329,10 +2331,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">  * @return string The sanitized value

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function sanitize_html_class( $class, $fallback = '' ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        //Strip out any % encoded octets

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Strip out any %-encoded octets.

</ins><span class="cx" style="display: block; padding: 0 10px">         $sanitized = preg_replace( '|%[a-fA-F0-9][a-fA-F0-9]|', '', $class );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        //Limit to A-Z,a-z,0-9,_,-

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Limit to A-Z, a-z, 0-9, '_', '-'.

</ins><span class="cx" style="display: block; padding: 0 10px">         $sanitized = preg_replace( '/[^A-Za-z0-9_-]/', '', $sanitized );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( '' == $sanitized && $fallback ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2381,10 +2383,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function convert_invalid_entities( $content ) {

</span><span class="cx" style="display: block; padding: 0 10px">        $wp_htmltranswinuni = array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                '&#128;' => '&#8364;', // the Euro sign

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         '&#128;' => '&#8364;', // The Euro sign.

</ins><span class="cx" style="display: block; padding: 0 10px">                 '&#129;' => '',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                '&#130;' => '&#8218;', // these are Windows CP1252 specific characters

-               '&#131;' => '&#402;',  // they would look weird on non-Windows browsers

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         '&#130;' => '&#8218;', // These are Windows CP1252 specific characters.

+               '&#131;' => '&#402;',  // They would look weird on non-Windows browsers.

</ins><span class="cx" style="display: block; padding: 0 10px">                 '&#132;' => '&#8222;',

</span><span class="cx" style="display: block; padding: 0 10px">                '&#133;' => '&#8230;',

</span><span class="cx" style="display: block; padding: 0 10px">                '&#134;' => '&#8224;',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2463,14 +2465,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $stacksize = 0;

</span><span class="cx" style="display: block; padding: 0 10px">        $tagqueue  = '';

</span><span class="cx" style="display: block; padding: 0 10px">        $newtext   = '';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Known single-entity/self-closing tags

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Known single-entity/self-closing tags.

</ins><span class="cx" style="display: block; padding: 0 10px">         $single_tags = array( 'area', 'base', 'basefont', 'br', 'col', 'command', 'embed', 'frame', 'hr', 'img', 'input', 'isindex', 'link', 'meta', 'param', 'source' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Tags that can be immediately nested within themselves

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Tags that can be immediately nested within themselves.

</ins><span class="cx" style="display: block; padding: 0 10px">         $nestable_tags = array( 'blockquote', 'div', 'object', 'q', '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">-        // WP bug fix for comments - in case you REALLY meant to type '< !--'

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // WP bug fix for comments - in case you REALLY meant to type '< !--'.

</ins><span class="cx" style="display: block; padding: 0 10px">         $text = str_replace( '< !--', '<    !--', $text );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // WP bug fix for LOVE <3 (and other situations with '<' before a number)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // WP bug fix for LOVE <3 (and other situations with '<' before a number).

</ins><span class="cx" style="display: block; padding: 0 10px">         $text = preg_replace( '#<([0-9]{1})#', '&lt;$1', $text );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2526,7 +2528,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Clear the shifter.

</span><span class="cx" style="display: block; padding: 0 10px">                $tagqueue = '';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( $has_leading_slash ) { // End Tag.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( $has_leading_slash ) { // End tag.

</ins><span class="cx" style="display: block; padding: 0 10px">                         // If too many closing tags.

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( $stacksize <= 0 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $tag = '';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2534,7 +2536,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                                // If stacktop value = tag close value, then pop.

</span><span class="cx" style="display: block; padding: 0 10px">                        } elseif ( $tagstack[ $stacksize - 1 ] === $tag ) { // Found closing tag.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $tag = '</' . $tag . '>'; // Close Tag.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $tag = '</' . $tag . '>'; // Close tag.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 array_pop( $tagstack );

</span><span class="cx" style="display: block; padding: 0 10px">                                $stacksize--;

<span class="cx" style="display: block; padding: 0 10px">                        } else { // Closing tag not at top, search for it.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2550,14 +2552,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px">                                $tag = '';

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                } else { // Begin Tag.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         } else { // Begin tag.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( $has_self_closer ) { // If it presents itself as a self-closing tag...

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // ...but it isn't a known single-entity self-closing tag, then don't let it be treated as such and

-                               // immediately close it with a closing tag (the tag will encapsulate no text as a result)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // ...but it isn't a known single-entity self-closing tag, then don't let it be treated as such

+                               // and immediately close it with a closing tag (the tag will encapsulate no text as a result).

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( ! $is_single_tag ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        $attributes = trim( substr( $attributes, 0, -1 ) ) . "></$tag";

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        } elseif ( $is_single_tag ) { // ElseIf it's a known single-entity tag but it doesn't close itself, do so

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 } elseif ( $is_single_tag ) { // Else if it's a known single-entity tag but it doesn't close itself, do so.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $pre_attribute_ws = ' ';

</span><span class="cx" style="display: block; padding: 0 10px">                                $attributes      .= '/';

</span><span class="cx" style="display: block; padding: 0 10px">                        } else { // It's not a single-entity tag.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2586,7 +2588,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $text     = substr( $text, $i + $l );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Clear Tag Queue.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Clear tag queue.

</ins><span class="cx" style="display: block; padding: 0 10px">         $newtext .= $tagqueue;

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">        // Add remaining text.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2818,8 +2820,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $url = $matches[2];

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ')' == $matches[3] && strpos( $url, '(' ) ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If the trailing character is a closing parethesis, and the URL has an opening parenthesis in it, add the closing parenthesis to the URL.

-               // Then we can let the parenthesis balancer do its thing below.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If the trailing character is a closing parethesis, and the URL has an opening parenthesis in it,

+               // add the closing parenthesis to the URL. Then we can let the parenthesis balancer do its thing below.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $url   .= $matches[3];

</span><span class="cx" style="display: block; padding: 0 10px">                $suffix = '';

</span><span class="cx" style="display: block; padding: 0 10px">        } else {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2826,7 +2828,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $suffix = $matches[3];

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Include parentheses in the URL only if paired

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Include parentheses in the URL only if paired.

</ins><span class="cx" style="display: block; padding: 0 10px">         while ( substr_count( $url, '(' ) < substr_count( $url, ')' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $suffix = strrchr( $url, ')' ) . $suffix;

</span><span class="cx" style="display: block; padding: 0 10px">                $url    = substr( $url, 0, strrpos( $url, ')' ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2873,7 +2875,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $dest = $matches[2];

</span><span class="cx" style="display: block; padding: 0 10px">        $dest = 'http://' . $dest;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // removed trailing [.,;:)] from URL

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Removed trailing [.,;:)] from URL.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( in_array( substr( $dest, -1 ), array( '.', ',', ';', ':', ')' ) ) === true ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $ret  = substr( $dest, -1 );

</span><span class="cx" style="display: block; padding: 0 10px">                $dest = substr( $dest, 0, strlen( $dest ) - 1 );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2926,8 +2928,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function make_clickable( $text ) {

</span><span class="cx" style="display: block; padding: 0 10px">        $r               = '';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $textarr         = preg_split( '/(<[^<>]+>)/', $text, -1, PREG_SPLIT_DELIM_CAPTURE ); // split out HTML tags

-       $nested_code_pre = 0; // Keep track of how many levels link is nested inside <pre> or <code>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $textarr         = preg_split( '/(<[^<>]+>)/', $text, -1, PREG_SPLIT_DELIM_CAPTURE ); // Split out HTML tags.

+       $nested_code_pre = 0; // Keep track of how many levels link is nested inside <pre> or <code>.

</ins><span class="cx" style="display: block; padding: 0 10px">         foreach ( $textarr as $piece ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( preg_match( '|^<code[\s>]|i', $piece ) || preg_match( '|^<pre[\s>]|i', $piece ) || preg_match( '|^<script[\s>]|i', $piece ) || preg_match( '|^<style[\s>]|i', $piece ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2941,10 +2943,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        continue;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Long strings might contain expensive edge cases ...

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Long strings might contain expensive edge cases...

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( 10000 < strlen( $piece ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // ... break it up

-                       foreach ( _split_str_by_whitespace( $piece, 2100 ) as $chunk ) { // 2100: Extra room for scheme and leading and trailing paretheses

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // ...break it up.

+                       foreach ( _split_str_by_whitespace( $piece, 2100 ) as $chunk ) { // 2100: Extra room for scheme and leading and trailing paretheses.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( 2101 < strlen( $chunk ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        $r .= $chunk; // Too big, no whitespace: bail.

</span><span class="cx" style="display: block; padding: 0 10px">                                } else {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2952,20 +2954,20 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                } else {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $ret = " $piece "; // Pad with whitespace to simplify the regexes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $ret = " $piece "; // Pad with whitespace to simplify the regexes.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $url_clickable = '~

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                ([\\s(<.,;:!?])                                        # 1: Leading whitespace, or punctuation

-                               (                                                      # 2: URL

-                                       [\\w]{1,20}+://                                # Scheme and hier-part prefix

-                                       (?=\S{1,2000}\s)                               # Limit to URLs less than about 2000 characters long

-                                       [\\w\\x80-\\xff#%\\~/@\\[\\]*(+=&$-]*+         # Non-punctuation URL character

-                                       (?:                                            # Unroll the Loop: Only allow puctuation URL character if followed by a non-punctuation URL character

-                                               [\'.,;:!?)]                            # Punctuation URL character

-                                               [\\w\\x80-\\xff#%\\~/@\\[\\]*(+=&$-]++ # Non-punctuation URL character

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         ([\\s(<.,;:!?])                                # 1: Leading whitespace, or punctuation.

+                               (                                              # 2: URL.

+                                       [\\w]{1,20}+://                                # Scheme and hier-part prefix.

+                                       (?=\S{1,2000}\s)                               # Limit to URLs less than about 2000 characters long.

+                                       [\\w\\x80-\\xff#%\\~/@\\[\\]*(+=&$-]*+         # Non-punctuation URL character.

+                                       (?:                                            # Unroll the Loop: Only allow puctuation URL character if followed by a non-punctuation URL character.

+                                               [\'.,;:!?)]                                    # Punctuation URL character.

+                                               [\\w\\x80-\\xff#%\\~/@\\[\\]*(+=&$-]++         # Non-punctuation URL character.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         )*

</span><span class="cx" style="display: block; padding: 0 10px">                                )

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                (\)?)                                                  # 3: Trailing closing parenthesis (for parethesis balancing post processing)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         (\)?)                                          # 3: Trailing closing parenthesis (for parethesis balancing post processing).

</ins><span class="cx" style="display: block; padding: 0 10px">                         ~xS';

<span class="cx" style="display: block; padding: 0 10px">                        // The regex is a non-anchored pattern and does not have a single fixed starting character.

<span class="cx" style="display: block; padding: 0 10px">                        // Tell PCRE to spend more time optimizing since, when used on a page load, it will probably be used several times.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2980,7 +2982,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">-        // Cleanup of accidental links within links

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Cleanup of accidental links within links.

</ins><span class="cx" style="display: block; padding: 0 10px">         return preg_replace( '#(<a([ \r\n\t]+[^>]+?>|>))<a [^>]+?>([^>]+?)</a></a>#i', '$1$3</a>', $r );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2996,14 +2998,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">  *

</span><span class="cx" style="display: block; padding: 0 10px">  *     _split_str_by_whitespace( "1234 67890 1234 67890a cd 1234   890 123456789 1234567890a    45678   1 3 5 7 90 ", 10 ) ==

</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">- *         0 => '1234 67890 ',  // 11 characters: Perfect split

- *         1 => '1234 ',        //  5 characters: '1234 67890a' was too long

- *         2 => '67890a cd ',   // 10 characters: '67890a cd 1234' was too long

- *         3 => '1234   890 ',  // 11 characters: Perfect split

- *         4 => '123456789 ',   // 10 characters: '123456789 1234567890a' was too long

- *         5 => '1234567890a ', // 12 characters: Too long, but no inner whitespace on which to split

- *         6 => '   45678   ',  // 11 characters: Perfect split

- *         7 => '1 3 5 7 90 ',  // 11 characters: End of $string

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *         0 => '1234 67890 ',  // 11 characters: Perfect split.

+ *         1 => '1234 ',        //  5 characters: '1234 67890a' was too long.

+ *         2 => '67890a cd ',   // 10 characters: '67890a cd 1234' was too long.

+ *         3 => '1234   890 ',  // 11 characters: Perfect split.

+ *         4 => '123456789 ',   // 10 characters: '123456789 1234567890a' was too long.

+ *         5 => '1234567890a ', // 12 characters: Too long, but no inner whitespace on which to split.

+ *         6 => '   45678   ',  // 11 characters: Perfect split.

+ *         7 => '1 3 5 7 90 ',  // 11 characters: End of $string.

</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">  * @since 3.4.0

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3188,10 +3190,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $link_html          = $matches[1];

</span><span class="cx" style="display: block; padding: 0 10px">        $original_link_html = $link_html;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Consider the html escaped if there are no unescaped quotes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Consider the HTML escaped if there are no unescaped quotes.

</ins><span class="cx" style="display: block; padding: 0 10px">         $is_escaped = ! preg_match( '/(^|[^\\\\])[\'"]/', $link_html );

</span><span class="cx" style="display: block; padding: 0 10px">        if ( $is_escaped ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Replace only the quotes so that they are parsable by wp_kses_hair, leave the rest as is

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Replace only the quotes so that they are parsable by wp_kses_hair(), leave the rest as is.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $link_html = preg_replace( '/\\\\([\'"])/', '$1', $link_html );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3207,7 +3209,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        $rel = apply_filters( 'wp_targeted_link_rel', 'noopener noreferrer', $link_html );

</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 early if no rel values to be added or if no actual target attribute

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Return early if no rel values to be added or if no actual target attribute.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! $rel || ! isset( $atts['target'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                return "<a $original_link_html>";

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3338,11 +3340,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">        global $wp_smiliessearch;

</span><span class="cx" style="display: block; padding: 0 10px">        $output = '';

</span><span class="cx" style="display: block; padding: 0 10px">        if ( get_option( 'use_smilies' ) && ! empty( $wp_smiliessearch ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // HTML loop taken from texturize function, could possible be consolidated

-               $textarr = preg_split( '/(<.*>)/U', $text, -1, PREG_SPLIT_DELIM_CAPTURE ); // capture the tags as well as in between

-               $stop    = count( $textarr );// loop stuff

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // HTML loop taken from texturize function, could possible be consolidated.

+               $textarr = preg_split( '/(<.*>)/U', $text, -1, PREG_SPLIT_DELIM_CAPTURE ); // Capture the tags as well as in between.

+               $stop    = count( $textarr ); // Loop stuff.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Ignore proessing of specific tags

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Ignore proessing of specific tags.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $tags_to_ignore       = 'code|pre|style|script|textarea';

</span><span class="cx" style="display: block; padding: 0 10px">                $ignore_block_element = '';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3349,17 +3351,17 @@

</span><span class="cx" style="display: block; padding: 0 10px">                for ( $i = 0; $i < $stop; $i++ ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $content = $textarr[ $i ];

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // If we're in an ignore block, wait until we find its closing tag

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // If we're in an ignore block, wait until we find its closing tag.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( '' == $ignore_block_element && preg_match( '/^<(' . $tags_to_ignore . ')[^>]*>/', $content, $matches ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $ignore_block_element = $matches[1];

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // If it's not a tag and not in ignore block

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // If it's not a tag and not in ignore block.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( '' == $ignore_block_element && strlen( $content ) > 0 && '<' != $content[0] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $content = preg_replace_callback( $wp_smiliessearch, 'translate_smiley', $content );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // did we exit ignore block

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Did we exit ignore block?

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( '' != $ignore_block_element && '</' . $ignore_block_element . '>' == $content ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $ignore_block_element = '';

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3367,7 +3369,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $output .= $content;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        } else {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // return default text.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Return default text.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $output = $text;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px">        return $output;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3389,7 +3391,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                _deprecated_argument( __FUNCTION__, '3.0.0' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Test for the minimum length the email can be

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Test for the minimum length the email can be.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( strlen( $email ) < 6 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                /**

<span class="cx" style="display: block; padding: 0 10px">                 * Filters whether an email address is valid.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3407,17 +3409,17 @@

</span><span class="cx" style="display: block; padding: 0 10px">                return apply_filters( 'is_email', false, $email, 'email_too_short' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Test for an @ character after the first position

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Test for an @ character after the first position.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( strpos( $email, '@', 1 ) === false ) {

</span><span class="cx" style="display: block; padding: 0 10px">                /** This filter is documented in wp-includes/formatting.php */

</span><span class="cx" style="display: block; padding: 0 10px">                return apply_filters( 'is_email', false, $email, 'email_no_at' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Split out the local and domain parts

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Split out the local and domain parts.

</ins><span class="cx" style="display: block; padding: 0 10px">         list( $local, $domain ) = explode( '@', $email, 2 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        // LOCAL PART

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Test for invalid characters

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Test for invalid characters.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! preg_match( '/^[a-zA-Z0-9!#$%&\'*+\/=?^_`{|}~\.-]+$/', $local ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                /** This filter is documented in wp-includes/formatting.php */

</span><span class="cx" style="display: block; padding: 0 10px">                return apply_filters( 'is_email', false, $email, 'local_invalid_chars' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3424,36 +3426,36 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        // DOMAIN PART

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Test for sequences of periods

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Test for sequences of periods.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( preg_match( '/\.{2,}/', $domain ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                /** This filter is documented in wp-includes/formatting.php */

</span><span class="cx" style="display: block; padding: 0 10px">                return apply_filters( 'is_email', false, $email, 'domain_period_sequence' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Test for leading and trailing periods and whitespace

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Test for leading and trailing periods and whitespace.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( trim( $domain, " \t\n\r\0\x0B." ) !== $domain ) {

</span><span class="cx" style="display: block; padding: 0 10px">                /** This filter is documented in wp-includes/formatting.php */

</span><span class="cx" style="display: block; padding: 0 10px">                return apply_filters( 'is_email', false, $email, 'domain_period_limits' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Split the domain into subs

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Split the domain into subs.

</ins><span class="cx" style="display: block; padding: 0 10px">         $subs = explode( '.', $domain );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Assume the domain will have at least two subs

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Assume the domain will have at least two subs.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( 2 > count( $subs ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                /** This filter is documented in wp-includes/formatting.php */

</span><span class="cx" style="display: block; padding: 0 10px">                return apply_filters( 'is_email', false, $email, 'domain_no_periods' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Loop through each sub

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Loop through each sub.

</ins><span class="cx" style="display: block; padding: 0 10px">         foreach ( $subs as $sub ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test for leading and trailing hyphens and whitespace

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test for leading and trailing hyphens and whitespace.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( trim( $sub, " \t\n\r\0\x0B-" ) !== $sub ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        /** This filter is documented in wp-includes/formatting.php */

</span><span class="cx" style="display: block; padding: 0 10px">                        return apply_filters( 'is_email', false, $email, 'sub_hyphen_limits' );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test for invalid characters

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test for invalid characters.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! preg_match( '/^[a-z0-9-]+$/i', $sub ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        /** This filter is documented in wp-includes/formatting.php */

</span><span class="cx" style="display: block; padding: 0 10px">                        return apply_filters( 'is_email', false, $email, 'sub_invalid_chars' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3460,7 +3462,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"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Congratulations your email made it!

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Congratulations, your email made it!

</ins><span class="cx" style="display: block; padding: 0 10px">         /** This filter is documented in wp-includes/formatting.php */

</span><span class="cx" style="display: block; padding: 0 10px">        return apply_filters( 'is_email', $email, $email, null );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3549,7 +3551,7 @@

<span class="cx" style="display: block; padding: 0 10px">  * @return int|float The offset in seconds.

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function iso8601_timezone_to_offset( $timezone ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // $timezone is either 'Z' or '[+|-]hhmm'

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // $timezone is either 'Z' or '[+|-]hhmm'.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( $timezone == 'Z' ) {

</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -3599,7 +3601,7 @@

<span class="cx" style="display: block; padding: 0 10px">  * @return string Filtered email address.

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function sanitize_email( $email ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Test for the minimum length the email can be

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Test for the minimum length the email can be.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( strlen( $email ) < 6 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                /**

<span class="cx" style="display: block; padding: 0 10px">                 * Filters a sanitized email address.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3617,17 +3619,17 @@

</span><span class="cx" style="display: block; padding: 0 10px">                return apply_filters( 'sanitize_email', '', $email, 'email_too_short' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Test for an @ character after the first position

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Test for an @ character after the first position.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( strpos( $email, '@', 1 ) === false ) {

</span><span class="cx" style="display: block; padding: 0 10px">                /** This filter is documented in wp-includes/formatting.php */

</span><span class="cx" style="display: block; padding: 0 10px">                return apply_filters( 'sanitize_email', '', $email, 'email_no_at' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Split out the local and domain parts

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Split out the local and domain parts.

</ins><span class="cx" style="display: block; padding: 0 10px">         list( $local, $domain ) = explode( '@', $email, 2 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        // LOCAL PART

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Test for invalid characters

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Test for invalid characters.

</ins><span class="cx" style="display: block; padding: 0 10px">         $local = preg_replace( '/[^a-zA-Z0-9!#$%&\'*+\/=?^_`{|}~\.-]/', '', $local );

</span><span class="cx" style="display: block; padding: 0 10px">        if ( '' === $local ) {

</span><span class="cx" style="display: block; padding: 0 10px">                /** This filter is documented in wp-includes/formatting.php */

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3635,7 +3637,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">        // DOMAIN PART

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Test for sequences of periods

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Test for sequences of periods.

</ins><span class="cx" style="display: block; padding: 0 10px">         $domain = preg_replace( '/\.{2,}/', '', $domain );

</span><span class="cx" style="display: block; padding: 0 10px">        if ( '' === $domain ) {

</span><span class="cx" style="display: block; padding: 0 10px">                /** This filter is documented in wp-includes/formatting.php */

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3642,7 +3644,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                return apply_filters( 'sanitize_email', '', $email, 'domain_period_sequence' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Test for leading and trailing periods and whitespace

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Test for leading and trailing periods and whitespace.

</ins><span class="cx" style="display: block; padding: 0 10px">         $domain = trim( $domain, " \t\n\r\0\x0B." );

</span><span class="cx" style="display: block; padding: 0 10px">        if ( '' === $domain ) {

</span><span class="cx" style="display: block; padding: 0 10px">                /** This filter is documented in wp-includes/formatting.php */

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3649,45 +3651,45 @@

</span><span class="cx" style="display: block; padding: 0 10px">                return apply_filters( 'sanitize_email', '', $email, 'domain_period_limits' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Split the domain into subs

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Split the domain into subs.

</ins><span class="cx" style="display: block; padding: 0 10px">         $subs = explode( '.', $domain );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Assume the domain will have at least two subs

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Assume the domain will have at least two subs.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( 2 > count( $subs ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                /** This filter is documented in wp-includes/formatting.php */

</span><span class="cx" style="display: block; padding: 0 10px">                return apply_filters( 'sanitize_email', '', $email, 'domain_no_periods' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Create an array that will contain valid subs

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Create an array that will contain valid subs.

</ins><span class="cx" style="display: block; padding: 0 10px">         $new_subs = array();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Loop through each sub

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Loop through each sub.

</ins><span class="cx" style="display: block; padding: 0 10px">         foreach ( $subs as $sub ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test for leading and trailing hyphens

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test for leading and trailing hyphens.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $sub = trim( $sub, " \t\n\r\0\x0B-" );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test for invalid characters

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test for invalid characters.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $sub = preg_replace( '/[^a-z0-9-]+/i', '', $sub );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If there's anything left, add it to the valid subs

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If there's anything left, add it to the valid subs.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( '' !== $sub ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $new_subs[] = $sub;

</span><span class="cx" style="display: 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 there aren't 2 or more valid subs

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If there aren't 2 or more valid subs.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( 2 > count( $new_subs ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                /** This filter is documented in wp-includes/formatting.php */

</span><span class="cx" style="display: block; padding: 0 10px">                return apply_filters( 'sanitize_email', '', $email, 'domain_no_valid_subs' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Join valid subs into the new domain

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Join valid subs into the new domain.

</ins><span class="cx" style="display: block; padding: 0 10px">         $domain = join( '.', $new_subs );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Put the email back together

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Put the email back together.

</ins><span class="cx" style="display: block; padding: 0 10px">         $sanitized_email = $local . '@' . $domain;

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Congratulations your email made it!

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Congratulations, your email made it!

</ins><span class="cx" style="display: block; padding: 0 10px">         /** This filter is documented in wp-includes/formatting.php */

</span><span class="cx" style="display: block; padding: 0 10px">        return apply_filters( 'sanitize_email', $sanitized_email, $email, null );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4304,9 +4306,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $url = str_replace( ';//', '://', $url );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /* If the URL doesn't appear to contain a scheme, we

-        * presume it needs http:// prepended (unless a relative

-        * link starting with /, # or ? or a php file).

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*

+        * If the URL doesn't appear to contain a scheme, we presume

+        * it needs http:// prepended (unless it's a relative link

+        * starting with /, # or ?, or a PHP file).

</ins><span class="cx" style="display: block; padding: 0 10px">          */

</span><span class="cx" style="display: block; padding: 0 10px">        if ( strpos( $url, ':' ) === false && ! in_array( $url[0], array( '/', '#', '?' ) ) &&

</span><span class="cx" style="display: block; padding: 0 10px">                ! preg_match( '/^[a-z0-9-]+?\.php/i', $url ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4622,7 +4625,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                case 'default_ping_status':

</span><span class="cx" style="display: block; padding: 0 10px">                case 'default_comment_status':

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Options that if not there have 0 value but need to be something like "closed"

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Options that if not there have 0 value but need to be something like "closed".

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( $value == '0' || $value == '' ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $value = 'closed';

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4643,7 +4646,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        break;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                case 'blog_charset':

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $value = preg_replace( '/[^a-zA-Z0-9_-]/', '', $value ); // strips slashes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $value = preg_replace( '/[^a-zA-Z0-9_-]/', '', $value ); // Strips slashes.

</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">                case 'blog_public':

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4678,7 +4681,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        break;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                case 'gmt_offset':

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $value = preg_replace( '/[^0-9:.-]/', '', $value ); // strips slashes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $value = preg_replace( '/[^0-9:.-]/', '', $value ); // Strips slashes.

</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">                case 'siteurl':

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4948,13 +4951,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $result    = '';

</span><span class="cx" style="display: block; padding: 0 10px">        $arg_index = 0;

</span><span class="cx" style="display: block; padding: 0 10px">        while ( $len > $start ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Last character: append and break

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Last character: append and break.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( strlen( $pattern ) - 1 == $start ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $result .= substr( $pattern, -1 );

</span><span class="cx" style="display: block; padding: 0 10px">                        break;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Literal %: append and continue

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Literal %: append and continue.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( substr( $pattern, $start, 2 ) == '%%' ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $start  += 2;

</span><span class="cx" style="display: block; padding: 0 10px">                        $result .= '%';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4961,7 +4964,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        continue;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Get fragment before next %

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Get fragment before next %.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $end = strpos( $pattern, '%', $start + 1 );

</span><span class="cx" style="display: block; padding: 0 10px">                if ( false === $end ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $end = $len;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4968,11 +4971,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">                $fragment = substr( $pattern, $start, $end - $start );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Fragment has a specifier

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Fragment has a specifier.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $pattern[ $start ] == '%' ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Find numbered arguments or take the next one in order

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Find numbered arguments or take the next one in order.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( preg_match( '/^%(\d+)\$/', $fragment, $matches ) ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $index    = $matches[1] - 1; // 0-based array vs 1-based sprintf arguments.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $index    = $matches[1] - 1; // 0-based array vs 1-based sprintf() arguments.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $arg      = isset( $args[ $index ] ) ? $args[ $index ] : '';

</span><span class="cx" style="display: block; padding: 0 10px">                                $fragment = str_replace( "%{$matches[1]}$", '%', $fragment );

</span><span class="cx" style="display: block; padding: 0 10px">                        } else {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4998,10 +5001,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Append to result and move to next fragment

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Append to result and move to next fragment.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $result .= $fragment;

</span><span class="cx" style="display: block; padding: 0 10px">                $start   = $end;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">         return $result;

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5019,12 +5023,12 @@

<span class="cx" style="display: block; padding: 0 10px">  * @return string Localized list items and rest of the content.

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function wp_sprintf_l( $pattern, $args ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Not a match

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Not a match.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( substr( $pattern, 0, 2 ) != '%l' ) {

</span><span class="cx" style="display: block; padding: 0 10px">                return $pattern;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Nothing to work with

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Nothing to work with.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( empty( $args ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                return '';

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5057,7 +5061,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">        if ( count( $args ) == 1 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $result .= $l['between_only_two'] . array_shift( $args );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Loop when more than two args

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

+       // Loop when more than two args.

</ins><span class="cx" style="display: block; padding: 0 10px">         $i = count( $args );

</span><span class="cx" style="display: block; padding: 0 10px">        while ( $i ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $arg = array_shift( $args );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5068,6 +5073,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $result .= $l['between'] . $arg;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">         return $result . substr( $pattern, 2 );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5089,13 +5095,16 @@

</span><span class="cx" style="display: block; padding: 0 10px">        if ( null === $more ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $more = '';

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">         $str     = wp_strip_all_tags( $str, true );

</span><span class="cx" style="display: block; padding: 0 10px">        $excerpt = mb_substr( $str, 0, $count );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // remove part of an entity at the end

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

+       // Remove part of an entity at the end.

</ins><span class="cx" style="display: block; padding: 0 10px">         $excerpt = preg_replace( '/&[^;\s]{0,6}$/', '', $excerpt );

</span><span class="cx" style="display: block; padding: 0 10px">        if ( $str != $excerpt ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $excerpt = trim( $excerpt ) . $more;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">         return $excerpt;

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5134,7 +5143,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function _links_add_base( $m ) {

</span><span class="cx" style="display: block; padding: 0 10px">        global $_links_add_base;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        //1 = attribute name  2 = quotation mark  3 = URL

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // 1 = attribute name  2 = quotation mark  3 = URL.

</ins><span class="cx" style="display: block; padding: 0 10px">         return $m[1] . '=' . $m[2] .

</span><span class="cx" style="display: block; padding: 0 10px">                ( preg_match( '#^(\w{1,20}):#', $m[3], $protocol ) && in_array( $protocol[1], wp_allowed_protocols() ) ?

</span><span class="cx" style="display: block; padding: 0 10px">                        $m[3] :

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5308,8 +5317,8 @@

<span class="cx" style="display: block; padding: 0 10px">                // This will strip extra whitespace for us.

</span><span class="cx" style="display: block; padding: 0 10px">                $filtered = wp_strip_all_tags( $filtered, 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">-                // Use html entities in a special case to make sure no later

-               // newline stripping stage could lead to a functional tag

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Use HTML entities in a special case to make sure no later

+               // newline stripping stage could lead to a functional tag.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $filtered = str_replace( "<\n", "&lt;\n", $filtered );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5359,12 +5368,12 @@

<span class="cx" style="display: block; padding: 0 10px">  * @return string The modified text.

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function capital_P_dangit( $text ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Simple replacement for titles

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Simple replacement for titles.

</ins><span class="cx" style="display: block; padding: 0 10px">         $current_filter = current_filter();

</span><span class="cx" style="display: block; padding: 0 10px">        if ( 'the_title' === $current_filter || 'wp_title' === $current_filter ) {

</span><span class="cx" style="display: block; padding: 0 10px">                return str_replace( 'Wordpress', 'WordPress', $text );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Still here? Use the more judicious replacement

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Still here? Use the more judicious replacement.

</ins><span class="cx" style="display: block; padding: 0 10px">         static $dblq = false;

</span><span class="cx" style="display: block; padding: 0 10px">        if ( false === $dblq ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $dblq = _x( '&#8220;', 'opening curly double quote' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5522,7 +5531,7 @@

<span class="cx" style="display: block; padding: 0 10px">  * Returns the regexp for common whitespace characters.

</span><span class="cx" style="display: block; padding: 0 10px">  *

<span class="cx" style="display: block; padding: 0 10px">  * By default, spaces include new lines, tabs, nbsp entities, and the UTF-8 nbsp.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * This is designed to replace the PCRE \s sequence.  In ticket #22692, that

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * This is designed to replace the PCRE \s sequence. In ticket #22692, that

</ins><span class="cx" style="display: block; padding: 0 10px">  * sequence was found to be unreliable due to random inclusion of the A0 byte.

</span><span class="cx" style="display: block; padding: 0 10px">  *

</span><span class="cx" style="display: block; padding: 0 10px">  * @since 4.0.0

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5798,7 +5807,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"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Did we exit ignore block.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Did we exit ignore block?

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( '' != $ignore_block_element && '</' . $ignore_block_element . '>' == $content ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $ignore_block_element = '';

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5806,7 +5815,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $output .= $content;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Finally, remove any stray U+FE0F characters

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Finally, remove any stray U+FE0F characters.

</ins><span class="cx" style="display: block; padding: 0 10px">         $output = str_replace( '&#xfe0f;', '', $output );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        return $output;

</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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/functions.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -323,7 +323,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> function wp_maybe_decline_date( $date, $format = '' ) {

</span><span class="cx" style="display: block; padding: 0 10px">        global $wp_locale;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // i18n functions are not available in SHORTINIT mode

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // i18n functions are not available in SHORTINIT mode.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! function_exists( '_x' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                return $date;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -384,7 +384,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Used for locale-specific rules

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Used for locale-specific rules.

</ins><span class="cx" style="display: block; padding: 0 10px">         $locale = get_locale();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( 'ca' === $locale ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -590,7 +590,7 @@

<span class="cx" style="display: block; padding: 0 10px">  * @return mixed Unserialized data can be any type.

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function maybe_unserialize( $original ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        if ( is_serialized( $original ) ) { // don't attempt to unserialize data that wasn't serialized going in

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_serialized( $original ) ) { // Don't attempt to unserialize data that wasn't serialized going in.

</ins><span class="cx" style="display: block; padding: 0 10px">                 return @unserialize( $original );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px">        return $original;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -609,7 +609,7 @@

<span class="cx" style="display: block; padding: 0 10px">  * @return bool False if not serialized and true if it was.

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function is_serialized( $data, $strict = true ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // if it isn't a string, it isn't serialized.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If it isn't a string, it isn't serialized.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! is_string( $data ) ) {

</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">@@ -653,7 +653,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        } elseif ( false === strpos( $data, '"' ) ) {

</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">-                        // or else fall through

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Or else fall through.

</ins><span class="cx" style="display: block; padding: 0 10px">                 case 'a':

</span><span class="cx" style="display: block; padding: 0 10px">                case 'O':

</span><span class="cx" style="display: block; padding: 0 10px">                        return (bool) preg_match( "/^{$token}:[0-9]+:/s", $data );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -708,9 +708,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                return serialize( $data );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Double serialization is required for backward compatibility.

-       // See https://core.trac.wordpress.org/ticket/12930

-       // Also the world will end. See WP 3.6.1.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*

+        * Double serialization is required for backward compatibility.

+        * See https://core.trac.wordpress.org/ticket/12930

+        * Also the world will end. See WP 3.6.1.

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( is_serialized( $data, false ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                return serialize( $data );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -897,8 +899,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                $type          = isset( $headers['content-type'] ) ? $headers['content-type'] : '';

</span><span class="cx" style="display: block; padding: 0 10px">                                $allowed_types = array( 'video', 'audio' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Check to see if we can figure out the mime type from

-                               // the extension

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Check to see if we can figure out the mime type from the extension.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $url_parts = @parse_url( $url );

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( false !== $url_parts ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        $extension = pathinfo( $url_parts['path'], PATHINFO_EXTENSION );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1121,7 +1122,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">        wp_parse_str( $query, $qs );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $qs = urlencode_deep( $qs ); // this re-URL-encodes things that were already in the query string

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $qs = urlencode_deep( $qs ); // This re-URL-encodes things that were already in the query string.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( is_array( $args[0] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $args[0] as $k => $v ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $qs[ $k ] = $v;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1154,7 +1155,7 @@

<span class="cx" style="display: block; padding: 0 10px">  * @return string New URL query string.

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function remove_query_arg( $key, $query = false ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        if ( is_array( $key ) ) { // removing multiple keys

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_array( $key ) ) { // Removing multiple keys.

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $key as $k ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $query = add_query_arg( $k, false, $query );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1485,7 +1486,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $expiresOffset = 10 * DAY_IN_SECONDS;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        header( 'Content-Type: text/javascript; charset=' . get_bloginfo( 'charset' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        header( 'Vary: Accept-Encoding' ); // Handle proxies

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ header( 'Vary: Accept-Encoding' ); // Handle proxies.

</ins><span class="cx" style="display: block; padding: 0 10px">         header( 'Expires: ' . gmdate( 'D, d M Y H:i:s', time() + $expiresOffset ) . ' GMT' );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1703,7 +1704,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! wp_installing() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $alloptions = wp_load_alloptions();

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // If siteurl is not set to autoload, check it specifically

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If siteurl is not set to autoload, check it specifically.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! isset( $alloptions['siteurl'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $installed = $wpdb->get_var( "SELECT option_value FROM $wpdb->options WHERE option_name = 'siteurl'" );

</span><span class="cx" style="display: block; padding: 0 10px">        } else {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2078,18 +2079,20 @@

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function wp_normalize_path( $path ) {

</span><span class="cx" style="display: block; padding: 0 10px">        $wrapper = '';

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( wp_is_stream( $path ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                list( $wrapper, $path ) = explode( '://', $path, 2 );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $wrapper               .= '://';

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

+               $wrapper .= '://';

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Standardise all paths to use /

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Standardise all paths to use '/'.

</ins><span class="cx" style="display: block; padding: 0 10px">         $path = str_replace( '\\', '/', $path );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">        // Replace multiple slashes down to a singular, allowing for network shares having two slashes.

</span><span class="cx" style="display: block; padding: 0 10px">        $path = preg_replace( '|(?<=.)/+|', '/', $path );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Windows paths should uppercase the drive letter

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Windows paths should uppercase the drive letter.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ':' === substr( $path, 1, 1 ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $path = ucfirst( $path );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2181,22 +2184,27 @@

<span class="cx" style="display: block; padding: 0 10px">  * @return bool Whether the path is writable.

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function win_is_writable( $path ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-

-       if ( $path[ strlen( $path ) - 1 ] == '/' ) { // if it looks like a directory, check a random file within the directory

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $path[ strlen( $path ) - 1 ] == '/' ) {

+               // If it looks like a directory, check a random file within the directory.

</ins><span class="cx" style="display: block; padding: 0 10px">                 return win_is_writable( $path . uniqid( mt_rand() ) . '.tmp' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        } elseif ( is_dir( $path ) ) { // If it's a directory (and not a file) check a random file within the directory

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( is_dir( $path ) ) {

+               // If it's a directory (and not a file), check a random file within the directory.

</ins><span class="cx" style="display: block; padding: 0 10px">                 return win_is_writable( $path . '/' . uniqid( mt_rand() ) . '.tmp' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // check tmp file for read/write capabilities

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

+       // Check tmp file for read/write capabilities.

</ins><span class="cx" style="display: block; padding: 0 10px">         $should_delete_tmp_file = ! file_exists( $path );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $f                      = @fopen( $path, 'a' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

+       $f = @fopen( $path, 'a' );

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( $f === false ) {

</span><span class="cx" style="display: block; padding: 0 10px">                return false;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px">        fclose( $f );

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( $should_delete_tmp_file ) {

</span><span class="cx" style="display: block; padding: 0 10px">                unlink( $path );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">         return true;

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2327,7 +2335,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        if ( empty( $upload_path ) || 'wp-content/uploads' == $upload_path ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $dir = WP_CONTENT_DIR . '/uploads';

</span><span class="cx" style="display: block; padding: 0 10px">        } elseif ( 0 !== strpos( $upload_path, ABSPATH ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // $dir is absolute, $upload_path is (maybe) relative to ABSPATH

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // $dir is absolute, $upload_path is (maybe) relative to ABSPATH.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $dir = path_join( ABSPATH, $upload_path );

</span><span class="cx" style="display: block; padding: 0 10px">        } else {

</span><span class="cx" style="display: block; padding: 0 10px">                $dir = $upload_path;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2351,7 +2359,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $url = trailingslashit( $siteurl ) . UPLOADS;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // If multisite (and if not the main site in a post-MU network)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If multisite (and if not the main site in a post-MU network).

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( is_multisite() && ! ( is_main_network() && is_main_site() && defined( 'MULTISITE' ) ) ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! get_site_option( 'ms_files_rewriting' ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2402,7 +2410,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $subdir = '';

</span><span class="cx" style="display: block; padding: 0 10px">        if ( get_option( 'uploads_use_yearmonth_folders' ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Generate the yearly and monthly dirs

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Generate the yearly and monthly directories.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! $time ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $time = current_time( 'mysql' );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2524,7 +2532,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                $new_ext = ! empty( $ext2 ) ? $ext2 : $ext;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                // Ensure this never goes into infinite loop

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // as it uses pathinfo() and regex in the check but string replacement for the changes.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // as it uses pathinfo() and regex in the check, but string replacement for the changes.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $count = count( $files );

</span><span class="cx" style="display: block; padding: 0 10px">                                $i     = 0;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2565,7 +2573,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $fname = pathinfo( $filename, PATHINFO_FILENAME );

</span><span class="cx" style="display: block; padding: 0 10px">        $ext   = pathinfo( $filename, PATHINFO_EXTENSION );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Edge case, file names like `.ext`

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Edge case, file names like `.ext`.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( empty( $fname ) ) {

</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">@@ -2681,7 +2689,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        fclose( $ifp );

</span><span class="cx" style="display: block; padding: 0 10px">        clearstatcache();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Set correct file permissions

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Set correct file permissions.

</ins><span class="cx" style="display: block; padding: 0 10px">         $stat  = @ stat( dirname( $new_file ) );

</span><span class="cx" style="display: block; padding: 0 10px">        $perms = $stat['mode'] & 0007777;

</span><span class="cx" style="display: block; padding: 0 10px">        $perms = $perms & 0000666;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2688,7 +2696,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        chmod( $new_file, $perms );

</span><span class="cx" style="display: block; padding: 0 10px">        clearstatcache();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Compute the URL

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Compute the URL.

</ins><span class="cx" style="display: block; padding: 0 10px">         $url = $upload['url'] . "/$filename";

</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-admin/includes/file.php */

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2785,12 +2793,12 @@

</span><span class="cx" style="display: block; padding: 0 10px"> function wp_check_filetype_and_ext( $file, $filename, $mimes = null ) {

</span><span class="cx" style="display: block; padding: 0 10px">        $proper_filename = 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">-        // Do basic extension validation and MIME mapping

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Do basic extension validation and MIME mapping.

</ins><span class="cx" style="display: block; padding: 0 10px">         $wp_filetype = wp_check_filetype( $filename, $mimes );

</span><span class="cx" style="display: block; padding: 0 10px">        $ext         = $wp_filetype['ext'];

</span><span class="cx" style="display: block; padding: 0 10px">        $type        = $wp_filetype['type'];

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // We can't do any further validation without a file to work with

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // We can't do any further validation without a file to work with.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! file_exists( $file ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                return compact( 'ext', 'type', 'proper_filename' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2800,7 +2808,7 @@

<span class="cx" style="display: block; padding: 0 10px">        // Validate image types.

</span><span class="cx" style="display: block; padding: 0 10px">        if ( $type && 0 === strpos( $type, 'image/' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Attempt to figure out what type of image it actually is

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Attempt to figure out what type of image it actually is.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $real_mime = wp_get_image_mime( $file );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $real_mime && $real_mime != $type ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2822,7 +2830,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">-                        // Replace whatever is after the last period in the filename with the correct extension

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Replace whatever is after the last period in the filename with the correct extension.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( ! empty( $mime_to_ext[ $real_mime ] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $filename_parts = explode( '.', $filename );

</span><span class="cx" style="display: block; padding: 0 10px">                                array_pop( $filename_parts );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2830,9 +2838,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                $new_filename     = implode( '.', $filename_parts );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( $new_filename != $filename ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        $proper_filename = $new_filename; // Mark that it changed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 $proper_filename = $new_filename; // Mark that it changed.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Redefine the extension / MIME

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Redefine the extension / MIME.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $wp_filetype = wp_check_filetype( $new_filename, $mimes );

</span><span class="cx" style="display: block; padding: 0 10px">                                $ext         = $wp_filetype['ext'];

</span><span class="cx" style="display: block; padding: 0 10px">                                $type        = $wp_filetype['type'];

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2849,7 +2857,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $real_mime = finfo_file( $finfo, $file );

</span><span class="cx" style="display: block; padding: 0 10px">                finfo_close( $finfo );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // fileinfo often misidentifies obscure files as one of these types

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // fileinfo often misidentifies obscure files as one of these types.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $nonspecific_types = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'application/octet-stream',

</span><span class="cx" style="display: block; padding: 0 10px">                        'application/encrypted',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2920,7 +2928,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">-        // The mime type must be allowed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // The mime type must be allowed.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( $type ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $allowed = get_allowed_mime_types();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3031,8 +3039,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'ogv'                          => 'video/ogg',

</span><span class="cx" style="display: block; padding: 0 10px">                        'webm'                         => 'video/webm',

</span><span class="cx" style="display: block; padding: 0 10px">                        'mkv'                          => 'video/x-matroska',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        '3gp|3gpp'                     => 'video/3gpp', // Can also be audio

-                       '3g2|3gp2'                     => 'video/3gpp2', // Can also be audio

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 '3gp|3gpp'                     => 'video/3gpp',  // Can also be audio.

+                       '3g2|3gp2'                     => 'video/3gpp2', // Can also be audio.

</ins><span class="cx" style="display: block; padding: 0 10px">                         // Text formats.

</span><span class="cx" style="display: block; padding: 0 10px">                        'txt|asc|c|cc|h|srt'           => 'text/plain',

</span><span class="cx" style="display: block; padding: 0 10px">                        'csv'                          => 'text/csv',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3982,7 +3990,7 @@

<span class="cx" style="display: block; padding: 0 10px">  * This supports the JsonSerializable interface for PHP 5.2-5.3 as well.

</span><span class="cx" style="display: block; padding: 0 10px">  *

</span><span class="cx" style="display: block; padding: 0 10px">  * @ignore

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since      4.4.0

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 4.4.0

</ins><span class="cx" style="display: block; padding: 0 10px">  * @deprecated 5.3.0 This function is no longer needed as support for PHP 5.2-5.3

<span class="cx" style="display: block; padding: 0 10px">  *                   has been dropped.

</span><span class="cx" style="display: block; padding: 0 10px">  * @access     private

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4222,7 +4230,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> function smilies_init() {

</span><span class="cx" style="display: block; padding: 0 10px">        global $wpsmiliestrans, $wp_smiliessearch;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // don't bother setting up smilies if they are disabled

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Don't bother setting up smilies if they are disabled.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! get_option( 'use_smilies' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                return;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4302,7 +4310,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $spaces = wp_spaces_regexp();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Begin first "subpattern"

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Begin first "subpattern".

</ins><span class="cx" style="display: block; padding: 0 10px">         $wp_smiliessearch = '/(?<=' . $spaces . '|^)';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $subchar = '';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4310,11 +4318,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $firstchar = substr( $smiley, 0, 1 );

</span><span class="cx" style="display: block; padding: 0 10px">                $rest      = substr( $smiley, 1 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // new subpattern?

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // New subpattern?

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $firstchar != $subchar ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( $subchar != '' ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $wp_smiliessearch .= ')(?=' . $spaces . '|$)';  // End previous "subpattern"

-                               $wp_smiliessearch .= '|(?<=' . $spaces . '|^)'; // Begin another "subpattern"

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $wp_smiliessearch .= ')(?=' . $spaces . '|$)';  // End previous "subpattern".

+                               $wp_smiliessearch .= '|(?<=' . $spaces . '|^)'; // Begin another "subpattern".

</ins><span class="cx" style="display: block; padding: 0 10px">                         }

</span><span class="cx" style="display: block; padding: 0 10px">                        $subchar           = $firstchar;

</span><span class="cx" style="display: block; padding: 0 10px">                        $wp_smiliessearch .= preg_quote( $firstchar, '/' ) . '(?:';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5348,25 +5356,25 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $abspath_fix         = str_replace( '\\', '/', ABSPATH );

</span><span class="cx" style="display: block; padding: 0 10px">                $script_filename_dir = dirname( $_SERVER['SCRIPT_FILENAME'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // The request is for the admin

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // The request is for the admin.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( strpos( $_SERVER['REQUEST_URI'], 'wp-admin' ) !== false || strpos( $_SERVER['REQUEST_URI'], 'wp-login.php' ) !== false ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $path = preg_replace( '#/(wp-admin/.*|wp-login.php)#i', '', $_SERVER['REQUEST_URI'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // The request is for a file in ABSPATH

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // The request is for a file in ABSPATH.

</ins><span class="cx" style="display: block; padding: 0 10px">                 } elseif ( $script_filename_dir . '/' == $abspath_fix ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Strip off any file/query params in the path

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Strip off any file/query params in the path.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $path = preg_replace( '#/[^/]*$#i', '', $_SERVER['PHP_SELF'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                } else {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( false !== strpos( $_SERVER['SCRIPT_FILENAME'], $abspath_fix ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Request is hitting a file inside ABSPATH

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Request is hitting a file inside ABSPATH.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $directory = str_replace( ABSPATH, '', $script_filename_dir );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Strip off the sub directory, and any file/query params

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Strip off the subdirectory, and any file/query params.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $path = preg_replace( '#/' . preg_quote( $directory, '#' ) . '/[^/]*$#i', '', $_SERVER['REQUEST_URI'] );

</span><span class="cx" style="display: block; padding: 0 10px">                        } elseif ( false !== strpos( $abspath_fix, $script_filename_dir ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Request is hitting a file above ABSPATH

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Request is hitting a file above ABSPATH.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $subdirectory = substr( $abspath_fix, strpos( $abspath_fix, $script_filename_dir ) + strlen( $script_filename_dir ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Strip off any file/query params from the path, appending the sub directory to the installation

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Strip off any file/query params from the path, appending the subdirectory to the installation.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $path = preg_replace( '#/[^/]*$#i', '', $_SERVER['REQUEST_URI'] ) . $subdirectory;

</span><span class="cx" style="display: block; padding: 0 10px">                        } else {

</span><span class="cx" style="display: block; padding: 0 10px">                                $path = $_SERVER['REQUEST_URI'];

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5373,7 +5381,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">-                $schema = is_ssl() ? 'https://' : 'http://'; // set_url_scheme() is not defined yet

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $schema = is_ssl() ? 'https://' : 'http://'; // set_url_scheme() is not defined yet.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $url    = $schema . $_SERVER['HTTP_HOST'] . $path;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5641,9 +5649,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">  * @return int

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function _wp_timezone_choice_usort_callback( $a, $b ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Don't use translated versions of Etc

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Don't use translated versions of Etc.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( 'Etc' === $a['continent'] && 'Etc' === $b['continent'] ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make the order of these more like the old dropdown

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make the order of these more like the old dropdown.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( 'GMT+' === substr( $a['city'], 0, 4 ) && 'GMT+' === substr( $b['city'], 0, 4 ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return -1 * ( strnatcasecmp( $a['city'], $b['city'] ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5667,7 +5675,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">                return strnatcasecmp( $a['t_city'], $b['t_city'] );

</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">-                // Force Etc to the bottom of the list

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Force Etc to the bottom of the list.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( 'Etc' === $a['continent'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return 1;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5712,7 +5720,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        continue;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // This determines what gets set and translated - we don't translate Etc/* strings here, they are done later

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // This determines what gets set and translated - we don't translate Etc/* strings here, they are done later.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $exists    = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        0 => ( isset( $zone[0] ) && $zone[0] ),

</span><span class="cx" style="display: block; padding: 0 10px">                        1 => ( isset( $zone[1] ) && $zone[1] ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5742,33 +5750,33 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        foreach ( $zonen as $key => $zone ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Build value in an array to join later

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Build value in an array to join later.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $value = array( $zone['continent'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( empty( $zone['city'] ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // It's at the continent level (generally won't happen)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // It's at the continent level (generally won't happen).

</ins><span class="cx" style="display: block; padding: 0 10px">                         $display = $zone['t_continent'];

</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">-                        // It's inside a continent group

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // It's inside a continent group.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Continent optgroup

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Continent optgroup.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( ! isset( $zonen[ $key - 1 ] ) || $zonen[ $key - 1 ]['continent'] !== $zone['continent'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $label       = $zone['t_continent'];

</span><span class="cx" style="display: block; padding: 0 10px">                                $structure[] = '<optgroup label="' . esc_attr( $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">-                        // Add the city to the value

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Add the city to the value.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $value[] = $zone['city'];

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $display = $zone['t_city'];

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! empty( $zone['subcity'] ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Add the subcity to the value

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Add the subcity to the value.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $value[]  = $zone['subcity'];

</span><span class="cx" style="display: block; padding: 0 10px">                                $display .= ' - ' . $zone['t_subcity'];

</span><span class="cx" style="display: 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">-                // Build the value

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Build the value.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $value    = join( '/', $value );

</span><span class="cx" style="display: block; padding: 0 10px">                $selected = '';

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $value === $selected_zone ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5776,13 +5784,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">                $structure[] = '<option ' . $selected . 'value="' . esc_attr( $value ) . '">' . esc_html( $display ) . '</option>';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Close continent optgroup

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Close continent optgroup.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! empty( $zone['city'] ) && ( ! isset( $zonen[ $key + 1 ] ) || ( isset( $zonen[ $key + 1 ] ) && $zonen[ $key + 1 ]['continent'] !== $zone['continent'] ) ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $structure[] = '</optgroup>';

</span><span class="cx" style="display: 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">-        // Do UTC

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Do UTC.

</ins><span class="cx" style="display: block; padding: 0 10px">         $structure[] = '<optgroup label="' . esc_attr__( 'UTC' ) . '">';

</span><span class="cx" style="display: block; padding: 0 10px">        $selected    = '';

</span><span class="cx" style="display: block; padding: 0 10px">        if ( 'UTC' === $selected_zone ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5791,7 +5799,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $structure[] = '<option ' . $selected . 'value="' . esc_attr( 'UTC' ) . '">' . __( 'UTC' ) . '</option>';

</span><span class="cx" style="display: block; padding: 0 10px">        $structure[] = '</optgroup>';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Do manual UTC offsets

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Do manual UTC offsets.

</ins><span class="cx" style="display: block; padding: 0 10px">         $structure[]  = '<optgroup label="' . esc_attr__( 'Manual Offsets' ) . '">';

</span><span class="cx" style="display: block; padding: 0 10px">        $offset_range = array(

</span><span class="cx" style="display: block; padding: 0 10px">                -12,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5985,7 +5993,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        $extra_headers = $context ? apply_filters( "extra_{$context}_headers", array() ) : array();

</span><span class="cx" style="display: block; padding: 0 10px">        if ( $extra_headers ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $extra_headers = array_combine( $extra_headers, $extra_headers ); // keys equal values

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $extra_headers = array_combine( $extra_headers, $extra_headers ); // Keys equal values.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $all_headers   = array_merge( $extra_headers, (array) $default_headers );

</span><span class="cx" style="display: block; padding: 0 10px">        } else {

</span><span class="cx" style="display: block; padding: 0 10px">                $all_headers = $default_headers;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6174,8 +6182,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $evanescent_hare = $start;

</span><span class="cx" style="display: block; padding: 0 10px">        $return          = array();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Set evanescent_hare to one past hare

-       // Increment hare two steps

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Set evanescent_hare to one past hare.

+       // Increment hare two steps.

</ins><span class="cx" style="display: block; padding: 0 10px">         while (

</span><span class="cx" style="display: block; padding: 0 10px">                $tortoise

</span><span class="cx" style="display: block; padding: 0 10px">        &&

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6189,12 +6197,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $return[ $hare ]            = 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">-                // tortoise got lapped - must be a loop

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Tortoise got lapped - must be a loop.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $tortoise == $evanescent_hare || $tortoise == $hare ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return $_return_loop ? $return : $tortoise;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Increment tortoise by one step

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Increment tortoise by one step.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $tortoise = isset( $override[ $tortoise ] ) ? $override[ $tortoise ] : call_user_func_array( $callback, array_merge( array( $tortoise ), $callback_args ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6277,7 +6285,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $trace       = debug_backtrace( false );

</span><span class="cx" style="display: block; padding: 0 10px">        $caller      = array();

</span><span class="cx" style="display: block; padding: 0 10px">        $check_class = ! is_null( $ignore_class );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $skip_frames++; // skip this function

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $skip_frames++; // Skip this function.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! isset( $truncate_paths ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $truncate_paths = array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6291,7 +6299,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $skip_frames--;

</span><span class="cx" style="display: block; padding: 0 10px">                } elseif ( isset( $call['class'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( $check_class && $ignore_class == $call['class'] ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                continue; // Filter out calls

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         continue; // Filter out calls.

</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">                        $caller[] = "{$call['class']}{$call['type']}{$call['function']}";

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6371,7 +6379,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $scheme_separator = strpos( $path, '://' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( false === $scheme_separator ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // $path isn't a stream

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // $path isn't a stream.

</ins><span class="cx" style="display: block; padding: 0 10px">                 return false;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6722,7 +6730,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">-        // Has to match the window name used in post_submit_meta_box()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Has to match the window name used in post_submit_meta_box().

</ins><span class="cx" style="display: block; padding: 0 10px">         $name = 'wp-preview-' . (int) $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">@@ -7012,7 +7020,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                'headers' => '',

</span><span class="cx" style="display: block; padding: 0 10px">        );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // get site name

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Get site name.

</ins><span class="cx" style="display: block; padding: 0 10px">         $site_name = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7459,7 +7467,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $dirsize = array();

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Exclude individual site directories from the total when checking the main site of a network

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Exclude individual site directories from the total when checking the main site of a network,

</ins><span class="cx" style="display: block; padding: 0 10px">         // as they are subdirectories and should not be counted.

</span><span class="cx" style="display: block; padding: 0 10px">        if ( is_multisite() && is_main_site() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $dirsize[ $directory ]['size'] = recurse_dirsize( $directory, $directory . '/sites', $max_execution_time );

</span></span></pre></div>

<a id="trunksrcwpincludesfunctionswpscriptsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/functions.wp-scripts.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/functions.wp-scripts.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/functions.wp-scripts.php      2020-01-29 00:43:23 UTC (rev 47122)

</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">         * @since 2.1.0

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        do_action( 'wp_print_scripts' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        if ( '' === $handles ) { // for wp_head

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' === $handles ) { // For 'wp_head'.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $handles = false;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunksrcwpincludesfunctionswpstylesphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/functions.wp-styles.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/functions.wp-styles.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/functions.wp-styles.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,7 +40,7 @@

<span class="cx" style="display: block; padding: 0 10px">  * @return string[] On success, an array of handles of processed WP_Dependencies items; otherwise, an empty array.

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function wp_print_styles( $handles = false ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        if ( '' === $handles ) { // for wp_head

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' === $handles ) { // For 'wp_head'.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $handles = false;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/general-template.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -703,8 +703,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function get_bloginfo( $show = '', $filter = 'raw' ) {

</span><span class="cx" style="display: block; padding: 0 10px">        switch ( $show ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                case 'home': // DEPRECATED

-               case 'siteurl': // DEPRECATED

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         case 'home':    // Deprecated.

+               case 'siteurl': // Deprecated.

</ins><span class="cx" style="display: block; padding: 0 10px">                         _deprecated_argument(

</span><span class="cx" style="display: block; padding: 0 10px">                                __FUNCTION__,

</span><span class="cx" style="display: block; padding: 0 10px">                                '2.2.0',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1071,8 +1071,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $title['title'] = single_term_title( '', false );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                /*

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                * If we're on the blog page that is not the homepage or

-               * a single post of any post type, use the post title.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * If we're on the blog page that is not the homepage

+               * or a single post of any post type, use the post title.

</ins><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">        } elseif ( is_home() || is_singular() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $title['title'] = single_post_title( '', false );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1195,14 +1195,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $search   = get_query_var( 's' );

</span><span class="cx" style="display: block; padding: 0 10px">        $title    = '';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $t_sep = '%WP_TITLE_SEP%'; // Temporary separator, for accurate flipping, if necessary

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t_sep = '%WP_TITLE_SEP%'; // Temporary separator, for accurate flipping, if necessary.

</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 there is a post

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If there is a post.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( is_single() || ( is_home() && ! is_front_page() ) || ( is_page() && ! is_front_page() ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $title = single_post_title( '', false );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // If there's a post type archive

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If there's a post type archive.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( is_post_type_archive() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $post_type = get_query_var( 'post_type' );

</span><span class="cx" style="display: block; padding: 0 10px">                if ( is_array( $post_type ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1214,12 +1214,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // If there's a category or tag

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If there's a category or tag.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( is_category() || is_tag() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $title = single_term_title( '', false );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // If there's a taxonomy

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If there's a taxonomy.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( is_tax() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $term = get_queried_object();

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $term ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1228,7 +1228,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // If there's an author

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If there's an author.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( is_author() && ! is_post_type_archive() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $author = get_queried_object();

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $author ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1241,7 +1241,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $title = post_type_archive_title( '', false );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // If there's a month

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If there's a month.

</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1249,7 +1249,7 @@

</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // If there's a year

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If there's a year.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( is_archive() && ! empty( $year ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $title = $year;

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! empty( $monthnum ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1260,13 +1260,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // If it's a search

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If it's a search.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( is_search() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                /* translators: 1: Separator, 2: Search query. */

</span><span class="cx" style="display: block; padding: 0 10px">                $title = sprintf( __( 'Search Results %1$s %2$s' ), $t_sep, strip_tags( $search ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // If it's a 404 page

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If it's a 404 page.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( is_404() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $title = __( 'Page not found' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1285,8 +1285,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        $title_array = apply_filters( 'wp_title_parts', explode( $t_sep, $title ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Determines position of the separator and direction of the breadcrumb

-       if ( 'right' == $seplocation ) { // sep on right, so reverse the order

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Determines position of the separator and direction of the breadcrumb.

+       if ( 'right' == $seplocation ) { // Separator on right, so reverse the order.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $title_array = array_reverse( $title_array );

</span><span class="cx" style="display: block; padding: 0 10px">                $title       = implode( " $sep ", $title_array ) . $prefix;

</span><span class="cx" style="display: block; padding: 0 10px">        } else {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1304,7 +1304,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        $title = apply_filters( 'wp_title', $title, $sep, $seplocation );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Send it out

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Send it out.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( $display ) {

</span><span class="cx" style="display: block; padding: 0 10px">                echo $title;

</span><span class="cx" style="display: block; padding: 0 10px">        } else {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1747,7 +1747,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $link_html     = "\t<option value='$url'$selected_attr>$before $text $after</option>\n";

</span><span class="cx" style="display: block; padding: 0 10px">        } elseif ( 'html' === $format ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $link_html = "\t<li>$before<a href='$url'$aria_current>$text</a>$after</li>\n";

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        } else { // custom

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else { // Custom.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $link_html = "\t$before<a href='$url'$aria_current>$text</a>$after\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">@@ -1850,7 +1850,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $order = 'DESC';

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // this is what will separate dates on weekly archive links

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // This is what will separate dates on weekly archive links.

</ins><span class="cx" style="display: block; padding: 0 10px">         $archive_week_separator = '&#8211;';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $sql_where = $wpdb->prepare( "WHERE post_type = %s AND post_status = 'publish'", $parsed_args['post_type'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2095,17 +2095,17 @@

</span><span class="cx" style="display: block; padding: 0 10px">        if ( isset( $_GET['w'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $w = (int) $_GET['w'];

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // week_begins = 0 stands for Sunday

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // week_begins = 0 stands for Sunday.

</ins><span class="cx" style="display: block; padding: 0 10px">         $week_begins = (int) get_option( 'start_of_week' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Let's figure out when we are

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Let's figure out when we are.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! empty( $monthnum ) && ! empty( $year ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $thismonth = zeroise( intval( $monthnum ), 2 );

</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // We need to get the month from MySQL

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // We need to get the month from MySQL.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $thisyear = (int) substr( $m, 0, 4 );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //it seems MySQL's weeks disagree with PHP's

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // It seems MySQL's weeks disagree with PHP's.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $d         = ( ( $w - 1 ) * 7 ) + 6;

</span><span class="cx" style="display: block; padding: 0 10px">                $thismonth = $wpdb->get_var( "SELECT DATE_FORMAT((DATE_ADD('{$thisyear}0101', INTERVAL $d DAY) ), '%m')" );

</span><span class="cx" style="display: block; padding: 0 10px">        } elseif ( ! empty( $m ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2123,7 +2123,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $unixmonth = mktime( 0, 0, 0, $thismonth, 1, $thisyear );

</span><span class="cx" style="display: block; padding: 0 10px">        $last_day  = gmdate( 't', $unixmonth );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Get the next and previous month and year with at least one post

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Get the next and previous month and year with at least one post.

</ins><span class="cx" style="display: block; padding: 0 10px">         $previous = $wpdb->get_row(

</span><span class="cx" style="display: block; padding: 0 10px">                "SELECT MONTH(post_date) AS month, YEAR(post_date) AS year

</span><span class="cx" style="display: block; padding: 0 10px">                FROM $wpdb->posts

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2198,7 +2198,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $daywithpost = array();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Get days with posts

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Get days with posts.

</ins><span class="cx" style="display: block; padding: 0 10px">         $dayswithposts = $wpdb->get_results(

</span><span class="cx" style="display: block; padding: 0 10px">                "SELECT DISTINCT DAYOFMONTH(post_date)

</span><span class="cx" style="display: block; padding: 0 10px">                FROM $wpdb->posts WHERE post_date >= '{$thisyear}-{$thismonth}-01 00:00:00'

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2212,7 +2212,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">-        // See how much we should pad in the beginning

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // See how much we should pad in the beginning.

</ins><span class="cx" style="display: block; padding: 0 10px">         $pad = calendar_week_mod( gmdate( 'w', $unixmonth ) - $week_begins );

</span><span class="cx" style="display: block; padding: 0 10px">        if ( 0 != $pad ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $calendar_output .= "\n\t\t" . '<td colspan="' . esc_attr( $pad ) . '" class="pad">&nbsp;</td>';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2236,7 +2236,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( in_array( $day, $daywithpost ) ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // any posts today?

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Any posts today?

</ins><span class="cx" style="display: block; padding: 0 10px">                         $date_format = gmdate( _x( 'F j, Y', 'daily archives date format' ), strtotime( "{$thisyear}-{$thismonth}-{$day}" ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        /* translators: Post calendar label. %s: Date. */

</span><span class="cx" style="display: block; padding: 0 10px">                        $label            = sprintf( __( 'Posts published on %s' ), $date_format );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3339,7 +3339,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! isset( $wp_rich_edit ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_rich_edit = false;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( get_user_option( 'rich_editing' ) == 'true' || ! is_user_logged_in() ) { // default to 'true' for logged out users

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( get_user_option( 'rich_editing' ) == 'true' || ! is_user_logged_in() ) { // Default to 'true' for logged out users.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( $is_safari ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $wp_rich_edit = ! wp_is_mobile() || ( preg_match( '!AppleWebKit/(\d+)!', $_SERVER['HTTP_USER_AGENT'], $match ) && intval( $match[1] ) >= 534 );

</span><span class="cx" style="display: block; padding: 0 10px">                        } elseif ( $is_IE ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3371,8 +3371,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">  * @return string Either 'tinymce', or 'html', or 'test'

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function wp_default_editor() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $r = user_can_richedit() ? 'tinymce' : 'html'; // defaults

-       if ( wp_get_current_user() ) { // look for cookie

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $r = user_can_richedit() ? 'tinymce' : 'html'; // Defaults.

+       if ( wp_get_current_user() ) { // Look for cookie.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $ed = get_user_setting( 'editor', 'tinymce' );

</span><span class="cx" style="display: block; padding: 0 10px">                $r  = ( in_array( $ed, array( 'tinymce', 'html', 'test' ) ) ) ? $ed : $r;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4094,8 +4094,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $format .= $wp_rewrite->using_permalinks() ? user_trailingslashit( $wp_rewrite->pagination_base . '/%#%', 'paged' ) : '?paged=%#%';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $defaults = array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                'base'               => $pagenum_link, // http://example.com/all_posts.php%_% : %_% is replaced by format (below)

-               'format'             => $format, // ?page=%#% : %#% is replaced by the page number

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         'base'               => $pagenum_link, // http://example.com/all_posts.php%_% : %_% is replaced by format (below).

+               'format'             => $format, // ?page=%#% : %#% is replaced by the page number.

</ins><span class="cx" style="display: block; padding: 0 10px">                 'total'              => $total,

</span><span class="cx" style="display: block; padding: 0 10px">                'current'            => $current,

</span><span class="cx" style="display: block; padding: 0 10px">                'aria_current'       => 'page',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4106,7 +4106,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                'end_size'           => 1,

</span><span class="cx" style="display: block; padding: 0 10px">                'mid_size'           => 2,

</span><span class="cx" style="display: block; padding: 0 10px">                'type'               => 'plain',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                'add_args'           => array(), // array of query args to add

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         'add_args'           => array(), // Array of query args to add.

</ins><span class="cx" style="display: block; padding: 0 10px">                 'add_fragment'       => '',

</span><span class="cx" style="display: block; padding: 0 10px">                'before_page_number' => '',

</span><span class="cx" style="display: block; padding: 0 10px">                'after_page_number'  => '',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4136,13 +4136,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $args['add_args'] = array_merge( $args['add_args'], urlencode_deep( $url_query_args ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Who knows what else people pass in $args

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Who knows what else people pass in $args.

</ins><span class="cx" style="display: block; padding: 0 10px">         $total = (int) $args['total'];

</span><span class="cx" style="display: block; padding: 0 10px">        if ( $total < 2 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                return;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px">        $current  = (int) $args['current'];

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $end_size = (int) $args['end_size']; // Out of bounds?  Make it the default.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $end_size = (int) $args['end_size']; // Out of bounds? Make it the default.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( $end_size < 1 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $end_size = 1;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4313,7 +4313,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">-        // Other color schemes are not available when running out of src

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Other color schemes are not available when running out of src.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( false !== strpos( get_bloginfo( 'version' ), '-src' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                return;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span></span></pre></div>

<a id="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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/http.php      2020-01-29 00:43:23 UTC (rev 47122)

</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">        $count = count( $capabilities );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // If we have a numeric $capabilities array, spoof a wp_remote_request() associative $args array

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If we have a numeric $capabilities array, spoof a wp_remote_request() associative $args array.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( $count && count( array_filter( array_keys( $capabilities ), 'is_numeric' ) ) == $count ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $capabilities = array_combine( array_values( $capabilities ), array_fill( 0, $count, true ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -417,7 +417,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $admin_origin = parse_url( admin_url() );

</span><span class="cx" style="display: block; padding: 0 10px">        $home_origin  = parse_url( home_url() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // @todo preserve port?

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // @todo Preserve port?

</ins><span class="cx" style="display: block; padding: 0 10px">         $allowed_origins = array_unique(

</span><span class="cx" style="display: block; padding: 0 10px">                array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'http://' . $admin_origin['host'],

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -549,7 +549,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $ip = $host;

</span><span class="cx" style="display: block; padding: 0 10px">                } else {

</span><span class="cx" style="display: block; padding: 0 10px">                        $ip = gethostbyname( $host );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( $ip === $host ) { // Error condition for gethostbyname()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 if ( $ip === $host ) { // Error condition for gethostbyname().

</ins><span class="cx" style="display: block; padding: 0 10px">                                 return false;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span></span></pre></div>

<a id="trunksrcwpincludesksesphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/kses.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/kses.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/kses.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1052,9 +1052,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $string == '' ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return '';

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // prevent multiple dashes in comments

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Prevent multiple dashes in comments.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $string = preg_replace( '/--+/', '-', $string );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // prevent three dashes closing a comment

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Prevent three dashes closing a comment.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $string = preg_replace( '/-$/', '', $string );

</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -1119,11 +1119,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                return "<$element$xhtml_slash>";

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Split it

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Split it.

</ins><span class="cx" style="display: block; padding: 0 10px">         $attrarr = wp_kses_hair( $attr, $allowed_protocols );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        // Go through $attrarr, and save the allowed attributes for this element

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // in $attr2

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // in $attr2.

</ins><span class="cx" style="display: block; padding: 0 10px">         $attr2 = '';

</span><span class="cx" style="display: block; padding: 0 10px">        foreach ( $attrarr as $arreach ) {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( wp_kses_attr_check( $arreach['name'], $arreach['value'], $arreach['whole'], $arreach['vless'], $element, $allowed_html ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1131,7 +1131,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Remove any "<" or ">" characters

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Remove any "<" or ">" characters.

</ins><span class="cx" style="display: block; padding: 0 10px">         $attr2 = preg_replace( '/[<>]/', '', $attr2 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        return "<$element$attr2$xhtml_slash>";

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1204,7 +1204,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( is_array( $allowed_attr[ $name_low ] ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // there are some checks

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // There are some checks.

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $allowed_attr[ $name_low ] as $currkey => $currval ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! wp_kses_check_attr_val( $value, $vless, $currkey, $currval ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $name  = '';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1241,7 +1241,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $attrname = '';

</span><span class="cx" style="display: block; padding: 0 10px">        $uris     = wp_kses_uri_attributes();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Loop through the whole attribute list

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Loop through the whole attribute list.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        while ( strlen( $attr ) != 0 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $working = 0; // Was the last operation successful?

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1258,7 +1258,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                break;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        case 1:

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                if ( preg_match( '/^\s*=\s*/', $attr ) ) { // equals sign

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         if ( preg_match( '/^\s*=\s*/', $attr ) ) { // Equals sign.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         $working = 1;

</span><span class="cx" style="display: block; padding: 0 10px">                                        $mode    = 2;

</span><span class="cx" style="display: block; padding: 0 10px">                                        $attr    = preg_replace( '/^\s*=\s*/', '', $attr );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1265,7 +1265,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        break;

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                if ( preg_match( '/^\s+/', $attr ) ) { // valueless

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         if ( preg_match( '/^\s+/', $attr ) ) { // Valueless.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         $working = 1;

</span><span class="cx" style="display: block; padding: 0 10px">                                        $mode    = 0;

</span><span class="cx" style="display: block; padding: 0 10px">                                        if ( false === array_key_exists( $attrname, $attrarr ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1346,17 +1346,17 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                break;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                } // switch

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         } // End switch.

</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 ( $working == 0 ) { // not well formed, remove and try again

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( $working == 0 ) { // Not well-formed, remove and try again.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $attr = wp_kses_html_error( $attr );

</span><span class="cx" style="display: block; padding: 0 10px">                        $mode = 0;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        } // while

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } // End while.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( $mode == 1 && false === array_key_exists( $attrname, $attrarr ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // special case, for when the attribute list ends with a valueless

-               // attribute like "selected"

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Special case, for when the attribute list ends with a valueless

+               // attribute like "selected".

</ins><span class="cx" style="display: block; padding: 0 10px">                 $attrarr[ $attrname ] = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'name'  => $attrname,

</span><span class="cx" style="display: block; padding: 0 10px">                        'value' => '',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1405,7 +1405,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $xhtml_slash = '';

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Split it

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Split it.

</ins><span class="cx" style="display: block; padding: 0 10px">         $attrarr = wp_kses_hair_parse( $attr );

</span><span class="cx" style="display: block; padding: 0 10px">        if ( false === $attrarr ) {

</span><span class="cx" style="display: block; padding: 0 10px">                return false;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1444,14 +1444,14 @@

<span class="cx" style="display: block; padding: 0 10px">        .     '\[\[?[^\[\]]+\]\]?' // Shortcode in the name position implies unfiltered_html.

</span><span class="cx" style="display: block; padding: 0 10px">        . ')'

</span><span class="cx" style="display: block; padding: 0 10px">        . '(?:'               // Attribute value.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        .     '\s*=\s*'       // All values begin with '='

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .     '\s*=\s*'       // All values begin with '='.

</ins><span class="cx" style="display: block; padding: 0 10px">         .     '(?:'

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        .         '"[^"]*"'   // Double-quoted

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .         '"[^"]*"'   // Double-quoted.

</ins><span class="cx" style="display: block; padding: 0 10px">         .     '|'

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        .         "'[^']*'"   // Single-quoted

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .         "'[^']*'"   // Single-quoted.

</ins><span class="cx" style="display: block; padding: 0 10px">         .     '|'

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        .         '[^\s"\']+' // Non-quoted

-       .         '(?:\s|$)'  // Must have a space

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .         '[^\s"\']+' // Non-quoted.

+       .         '(?:\s|$)'  // Must have a space.

</ins><span class="cx" style="display: block; padding: 0 10px">         .     ')'

</span><span class="cx" style="display: block; padding: 0 10px">        . '|'

<span class="cx" style="display: block; padding: 0 10px">        .     '(?:\s|$)'      // If attribute has no value, space is required.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1492,9 +1492,11 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        switch ( strtolower( $checkname ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                case 'maxlen':

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // The maxlen check makes sure that the attribute value has a length not

-                       // greater than the given value. This can be used to avoid Buffer Overflows

-                       // in WWW clients and various Internet servers.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 /*

+                        * The maxlen check makes sure that the attribute value has a length not

+                        * greater than the given value. This can be used to avoid Buffer Overflows

+                        * in WWW clients and various Internet servers.

+                        */

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( strlen( $value ) > $checkvalue ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $ok = false;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1502,8 +1504,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        break;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                case 'minlen':

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // The minlen check makes sure that the attribute value has a length not

-                       // smaller than the given value.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 /*

+                        * The minlen check makes sure that the attribute value has a length not

+                        * smaller than the given value.

+                        */

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( strlen( $value ) < $checkvalue ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $ok = false;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1511,11 +1515,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        break;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                case 'maxval':

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // The maxval check does two things: it checks that the attribute value is

-                       // an integer from 0 and up, without an excessive amount of zeroes or

-                       // whitespace (to avoid Buffer Overflows). It also checks that the attribute

-                       // value is not greater than the given value.

-                       // This check can be used to avoid Denial of Service attacks.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 /*

+                        * The maxval check does two things: it checks that the attribute value is

+                        * an integer from 0 and up, without an excessive amount of zeroes or

+                        * whitespace (to avoid Buffer Overflows). It also checks that the attribute

+                        * value is not greater than the given value.

+                        * This check can be used to avoid Denial of Service attacks.

+                        */

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! preg_match( '/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $ok = false;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1526,8 +1532,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        break;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                case 'minval':

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // The minval check makes sure that the attribute value is a positive integer,

-                       // and that it is not smaller than the given value.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 /*

+                        * The minval check makes sure that the attribute value is a positive integer,

+                        * and that it is not smaller than the given value.

+                        */

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! preg_match( '/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $ok = false;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1538,16 +1546,18 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        break;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                case 'valueless':

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // The valueless check makes sure if the attribute has a value

-                       // (like `<a href="blah">`) or not (`<option selected>`). If the given value

-                       // is a "y" or a "Y", the attribute must not have a value.

-                       // If the given value is an "n" or an "N", the attribute must have a value.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 /*

+                        * The valueless check makes sure if the attribute has a value

+                        * (like `<a href="blah">`) or not (`<option selected>`). If the given value

+                        * is a "y" or a "Y", the attribute must not have a value.

+                        * If the given value is an "n" or an "N", the attribute must have a value.

+                        */

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( strtolower( $checkvalue ) != $vless ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $ok = false;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                        break;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        } // switch

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } // End switch.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        return $ok;

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1743,7 +1753,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        // Disarm all entities by converting & to &amp;

</span><span class="cx" style="display: block; padding: 0 10px">        $string = str_replace( '&', '&amp;', $string );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Change back the allowed entities in our entity whitelist

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Change back the allowed entities in our entity whitelist.

</ins><span class="cx" style="display: block; padding: 0 10px">         $string = preg_replace_callback( '/&amp;([A-Za-z]{2,8}[0-9]{0,2});/', 'wp_kses_named_entities', $string );

</span><span class="cx" style="display: block; padding: 0 10px">        $string = preg_replace_callback( '/&amp;#(0*[0-9]{1,7});/', 'wp_kses_normalize_entities2', $string );

</span><span class="cx" style="display: block; padding: 0 10px">        $string = preg_replace_callback( '/&amp;#[Xx](0*[0-9A-Fa-f]{1,6});/', 'wp_kses_normalize_entities3', $string );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1991,10 +2001,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">  * @since 2.0.0

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function kses_init_filters() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Normal filtering

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Normal filtering.

</ins><span class="cx" style="display: block; padding: 0 10px">         add_filter( 'title_save_pre', 'wp_filter_kses' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Comment filtering

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Comment filtering.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( current_user_can( 'unfiltered_html' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'pre_comment_content', 'wp_filter_post_kses' );

</span><span class="cx" style="display: block; padding: 0 10px">        } else {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2001,7 +2011,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'pre_comment_content', 'wp_filter_kses' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</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 filtering

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Post filtering.

</ins><span class="cx" style="display: block; padding: 0 10px">         add_filter( 'content_save_pre', 'wp_filter_post_kses' );

</span><span class="cx" style="display: block; padding: 0 10px">        add_filter( 'excerpt_save_pre', 'wp_filter_post_kses' );

</span><span class="cx" style="display: block; padding: 0 10px">        add_filter( 'content_filtered_save_pre', 'wp_filter_post_kses' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2020,14 +2030,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">  * @since 2.0.6

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function kses_remove_filters() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Normal filtering

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Normal filtering.

</ins><span class="cx" style="display: block; padding: 0 10px">         remove_filter( 'title_save_pre', 'wp_filter_kses' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Comment filtering

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Comment filtering.

</ins><span class="cx" style="display: block; padding: 0 10px">         remove_filter( 'pre_comment_content', 'wp_filter_post_kses' );

</span><span class="cx" style="display: block; padding: 0 10px">        remove_filter( 'pre_comment_content', 'wp_filter_kses' );

</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 filtering

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Post filtering.

</ins><span class="cx" style="display: block; padding: 0 10px">         remove_filter( 'content_save_pre', 'wp_filter_post_kses' );

</span><span class="cx" style="display: block; padding: 0 10px">        remove_filter( 'excerpt_save_pre', 'wp_filter_post_kses' );

</span><span class="cx" style="display: block; padding: 0 10px">        remove_filter( 'content_filtered_save_pre', 'wp_filter_post_kses' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2061,7 +2071,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function safecss_filter_attr( $css, $deprecated = '' ) {

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! empty( $deprecated ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                _deprecated_argument( __FUNCTION__, '2.8.1' ); // Never implemented

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         _deprecated_argument( __FUNCTION__, '2.8.1' ); // Never implemented.

</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">        $css = wp_kses_no_null( $css );

</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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/link-template.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -195,8 +195,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        $category = get_category_parents( $category_object->parent, false, '/', true ) . $category;

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // show default category in permalinks, without

-                       // having to assign it explicitly

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Show default category in permalinks,

+                       // without having to assign it explicitly.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( empty( $category ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $default_category = get_term( get_option( 'default_category' ), 'category' );

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( $default_category && ! is_wp_error( $default_category ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -232,7 +232,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $permalink = home_url( str_replace( $rewritecode, $rewritereplace, $permalink ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $permalink = user_trailingslashit( $permalink, 'single' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        } else { // if they're not using the fancy permalink option

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else { // If they're not using the fancy permalink option.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $permalink = home_url( '?p=' . $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">@@ -423,13 +423,13 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( $wp_rewrite->using_permalinks() && $parent ) {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( 'page' == $parent->post_type ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $parentlink = _get_page_link( $post->post_parent ); // Ignores page_on_front

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $parentlink = _get_page_link( $post->post_parent ); // Ignores page_on_front.

</ins><span class="cx" style="display: block; padding: 0 10px">                 } else {

</span><span class="cx" style="display: block; padding: 0 10px">                        $parentlink = get_permalink( $post->post_parent );

</span><span class="cx" style="display: 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_numeric( $post->post_name ) || false !== strpos( get_option( 'permalink_structure' ), '%category%' ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $name = 'attachment/' . $post->post_name; // <permalink>/<int>/ is paged so we use the explicit attachment marker

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $name = 'attachment/' . $post->post_name; // <permalink>/<int>/ is paged so we use the explicit attachment marker.

</ins><span class="cx" style="display: block; padding: 0 10px">                 } else {

</span><span class="cx" style="display: block; padding: 0 10px">                        $name = $post->post_name;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1087,7 +1087,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> /**

<span class="cx" style="display: block; padding: 0 10px">  * Retrieves the permalink for a search.

</span><span class="cx" style="display: block; padding: 0 10px">  *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since  3.0.0

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 3.0.0

</ins><span class="cx" style="display: block; padding: 0 10px">  *

<span class="cx" style="display: block; padding: 0 10px">  * @global WP_Rewrite $wp_rewrite WordPress rewrite component.

</span><span class="cx" style="display: block; padding: 0 10px">  *

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1649,7 +1649,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">        return apply_filters( 'get_edit_user_link', $link, $user->ID );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Navigation links

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+//

+// Navigation links.

+//

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> /**

<span class="cx" style="display: block; padding: 0 10px">  * Retrieves the previous post that is adjacent to the current post.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2513,7 +2515,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $max_num_pages = $wp_query->max_num_pages;

</span><span class="cx" style="display: block; padding: 0 10px">                $paged         = get_query_var( 'paged' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //only have sep if there's both prev and next results

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Only have sep if there's both prev and next results.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $paged < 2 || $paged >= $max_num_pages ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $args['sep'] = '';

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3881,7 +3883,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $shortlink = '';

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Return p= link for all public post types.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Return `?p=` link for all public post types.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! empty( $post_id ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $post_type = get_post_type_object( $post->post_type );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4091,7 +4093,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'force_default'  => false,

</span><span class="cx" style="display: block; padding: 0 10px">                        'rating'         => get_option( 'avatar_rating' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        'scheme'         => null,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'processed_args' => null, // if used, should be a reference

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'processed_args' => null, // If used, should be a reference.

</ins><span class="cx" style="display: block; padding: 0 10px">                         'extra_attr'     => '',

</span><span class="cx" style="display: block; padding: 0 10px">                )

</span><span class="cx" style="display: block; padding: 0 10px">        );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4177,17 +4179,17 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $user = get_user_by( 'id', absint( $id_or_email ) );

</span><span class="cx" style="display: block; padding: 0 10px">        } elseif ( is_string( $id_or_email ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( strpos( $id_or_email, '@md5.gravatar.com' ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // md5 hash

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // MD5 hash.

</ins><span class="cx" style="display: block; padding: 0 10px">                         list( $email_hash ) = explode( '@', $id_or_email );

</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">-                        // email address

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Email address.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $email = $id_or_email;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        } elseif ( $id_or_email instanceof WP_User ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // User Object

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // User object.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $user = $id_or_email;

</span><span class="cx" style="display: block; padding: 0 10px">        } elseif ( $id_or_email instanceof WP_Post ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Post Object

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Post object.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $user = get_user_by( 'id', (int) $id_or_email->post_author );

</span><span class="cx" style="display: block; padding: 0 10px">        } elseif ( $id_or_email instanceof WP_Comment ) {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! is_avatar_comment_type( get_comment_type( $id_or_email ) ) ) {

</span></span></pre></div>

<a id="trunksrcwpincludesloadphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/load.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/load.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/load.php      2020-01-29 00:43:23 UTC (rev 47122)

</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">                die( 'GLOBALS overwrite attempt detected' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Variables that shouldn't be unset

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Variables that shouldn't be unset.

</ins><span class="cx" style="display: block; padding: 0 10px">         $no_unset = array( 'GLOBALS', '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES', 'table_prefix' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $input = array_merge( $_GET, $_POST, $_COOKIE, $_SERVER, $_ENV, $_FILES, isset( $_SESSION ) && is_array( $_SESSION ) ? $_SESSION : array() );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,22 +65,22 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $_SERVER = array_merge( $default_server_values, $_SERVER );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Fix for IIS when running with PHP ISAPI

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Fix for IIS when running with PHP ISAPI.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( empty( $_SERVER['REQUEST_URI'] ) || ( PHP_SAPI != 'cgi-fcgi' && preg_match( '/^Microsoft-IIS\//', $_SERVER['SERVER_SOFTWARE'] ) ) ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( isset( $_SERVER['HTTP_X_ORIGINAL_URL'] ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // IIS Mod-Rewrite

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // IIS Mod-Rewrite.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $_SERVER['REQUEST_URI'] = $_SERVER['HTTP_X_ORIGINAL_URL'];

</span><span class="cx" style="display: block; padding: 0 10px">                } elseif ( isset( $_SERVER['HTTP_X_REWRITE_URL'] ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // IIS Isapi_Rewrite

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // IIS Isapi_Rewrite.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $_SERVER['REQUEST_URI'] = $_SERVER['HTTP_X_REWRITE_URL'];

</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">-                        // Use ORIG_PATH_INFO if there is no PATH_INFO

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Use ORIG_PATH_INFO if there is no PATH_INFO.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( ! isset( $_SERVER['PATH_INFO'] ) && isset( $_SERVER['ORIG_PATH_INFO'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $_SERVER['PATH_INFO'] = $_SERVER['ORIG_PATH_INFO'];

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Some IIS + PHP configurations puts the script-name in the path-info (No need to append it twice)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Some IIS + PHP configurations put the script-name in the path-info (no need to append it twice).

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( isset( $_SERVER['PATH_INFO'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( $_SERVER['PATH_INFO'] == $_SERVER['SCRIPT_NAME'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        $_SERVER['REQUEST_URI'] = $_SERVER['PATH_INFO'];

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -89,7 +89,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Append the query string if it exists and isn't null

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Append the query string if it exists and isn't null.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( ! empty( $_SERVER['QUERY_STRING'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $_SERVER['REQUEST_URI'] .= '?' . $_SERVER['QUERY_STRING'];

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,17 +96,17 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Fix for PHP as CGI hosts that set SCRIPT_FILENAME to something ending in php.cgi for all requests

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Fix for PHP as CGI hosts that set SCRIPT_FILENAME to something ending in php.cgi for all requests.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( isset( $_SERVER['SCRIPT_FILENAME'] ) && ( strpos( $_SERVER['SCRIPT_FILENAME'], 'php.cgi' ) == strlen( $_SERVER['SCRIPT_FILENAME'] ) - 7 ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $_SERVER['SCRIPT_FILENAME'] = $_SERVER['PATH_TRANSLATED'];

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Fix for Dreamhost and other PHP as CGI hosts

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Fix for Dreamhost and other PHP as CGI hosts.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( strpos( $_SERVER['SCRIPT_NAME'], 'php.cgi' ) !== false ) {

</span><span class="cx" style="display: block; padding: 0 10px">                unset( $_SERVER['PATH_INFO'] );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Fix empty PHP_SELF

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Fix empty PHP_SELF.

</ins><span class="cx" style="display: block; padding: 0 10px">         $PHP_SELF = $_SERVER['PHP_SELF'];

</span><span class="cx" style="display: block; padding: 0 10px">        if ( empty( $PHP_SELF ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $_SERVER['PHP_SELF'] = preg_replace( '/(\?.*)?$/', '', $_SERVER['REQUEST_URI'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -471,7 +471,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                'umeta_id'         => '%d',

</span><span class="cx" style="display: block; padding: 0 10px">                'comment_karma'    => '%d',

</span><span class="cx" style="display: block; padding: 0 10px">                'comment_count'    => '%d',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // multisite:

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Multisite:

</ins><span class="cx" style="display: block; padding: 0 10px">                 'active'           => '%d',

</span><span class="cx" style="display: block; padding: 0 10px">                'cat_id'           => '%d',

</span><span class="cx" style="display: block; padding: 0 10px">                'deleted'          => '%d',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -549,7 +549,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        wp_using_ext_object_cache( 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">-                                // Re-initialize any hooks added manually by object-cache.php

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Re-initialize any hooks added manually by object-cache.php.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( $wp_filter ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        $wp_filter = WP_Hook::build_preinitialized_hooks( $wp_filter );

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -666,7 +666,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $plugins        = array();

</span><span class="cx" style="display: block; padding: 0 10px">        $active_plugins = (array) get_option( 'active_plugins', array() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Check for hacks file if the option is enabled

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Check for hacks file if the option is enabled.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( get_option( 'hack_file' ) && file_exists( ABSPATH . 'my-hacks.php' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                _deprecated_file( 'my-hacks.php', '1.5.0' );

</span><span class="cx" style="display: block; padding: 0 10px">                array_unshift( $plugins, ABSPATH . 'my-hacks.php' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -679,10 +679,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $network_plugins = is_multisite() ? wp_get_active_network_plugins() : false;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        foreach ( $active_plugins as $plugin ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( ! validate_file( $plugin ) // $plugin must validate as file

-                       && '.php' == substr( $plugin, -4 ) // $plugin must end with '.php'

-                       && file_exists( WP_PLUGIN_DIR . '/' . $plugin ) // $plugin must exist

-                       // not already included as a network plugin

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( ! validate_file( $plugin )                     // $plugin must validate as file.

+                       && '.php' == substr( $plugin, -4 )              // $plugin must end with '.php'.

+                       && file_exists( WP_PLUGIN_DIR . '/' . $plugin ) // $plugin must exist.

+                       // Not already included as a network plugin.

</ins><span class="cx" style="display: block; padding: 0 10px">                         && ( ! $network_plugins || ! in_array( WP_PLUGIN_DIR . '/' . $plugin, $network_plugins ) )

</span><span class="cx" style="display: block; padding: 0 10px">                        ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $plugins[] = WP_PLUGIN_DIR . '/' . $plugin;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -960,7 +960,7 @@

<span class="cx" style="display: block; padding: 0 10px">  * @return object The cloned object.

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function wp_clone( $object ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Use parens for clone to accommodate PHP 4. See #17880

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Use parens for clone to accommodate PHP 4. See #17880.

</ins><span class="cx" style="display: block; padding: 0 10px">         return clone( $object );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1149,16 +1149,16 @@

</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">-        // We need $wp_local_package

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // We need $wp_local_package.

</ins><span class="cx" style="display: block; padding: 0 10px">         require ABSPATH . WPINC . '/version.php';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Translation and localization

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Translation and localization.

</ins><span class="cx" style="display: block; padding: 0 10px">         require_once ABSPATH . WPINC . '/pomo/mo.php';

</span><span class="cx" style="display: block; padding: 0 10px">        require_once ABSPATH . WPINC . '/l10n.php';

</span><span class="cx" style="display: block; padding: 0 10px">        require_once ABSPATH . WPINC . '/class-wp-locale.php';

</span><span class="cx" style="display: block; padding: 0 10px">        require_once ABSPATH . WPINC . '/class-wp-locale-switcher.php';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // General libraries

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // General libraries.

</ins><span class="cx" style="display: block; padding: 0 10px">         require_once ABSPATH . WPINC . '/plugin.php';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $locales   = array();

</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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/media.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,7 +73,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        } elseif ( $size === 'thumb' || $size === 'thumbnail' ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $max_width  = intval( get_option( 'thumbnail_size_w' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $max_height = intval( get_option( 'thumbnail_size_h' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // last chance thumbnail size defaults

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Last chance thumbnail size defaults.

</ins><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="cx" style="display: block; padding: 0 10px">                        $max_height = 96;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -109,7 +109,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                if ( intval( $content_width ) > 0 && 'edit' === $context ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $max_width = min( intval( $content_width ), $max_width );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        } else { // $size == 'full' has no constraint

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else { // $size === 'full' has no constraint.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $max_width  = $width;

</span><span class="cx" style="display: block; padding: 0 10px">                $max_height = $height;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</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"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // try for a new style intermediate size

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Try for a new style intermediate size.

</ins><span class="cx" style="display: block; padding: 0 10px">         $intermediate = image_get_intermediate_size( $id, $size );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( $intermediate ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -239,7 +239,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $height          = $intermediate['height'];

</span><span class="cx" style="display: block; padding: 0 10px">                $is_intermediate = true;

</span><span class="cx" style="display: block; padding: 0 10px">        } elseif ( $size === 'thumbnail' ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // fall back to the old thumbnail

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Fall back to the old thumbnail.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $thumb_file = wp_get_attachment_thumb_file( $id );

</span><span class="cx" style="display: block; padding: 0 10px">                $info       = null;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -256,13 +256,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! $width && ! $height && isset( $meta['width'], $meta['height'] ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // any other type: use the real image

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Any other type: use the real image.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $width  = $meta['width'];

</span><span class="cx" style="display: block; padding: 0 10px">                $height = $meta['height'];

</span><span class="cx" style="display: 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 ( $img_url ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // we have the actual image size, but might need to further constrain it if content_width is narrower

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // We have the actual image size, but might need to further constrain it if content_width is narrower.

</ins><span class="cx" style="display: block; padding: 0 10px">                 list( $width, $height ) = image_constrain_size_for_editor( $width, $height, $size );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                return array( $img_url, $width, $height, $is_intermediate );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -450,7 +450,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $did_height   = 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">-        // Calculate the larger/smaller ratios

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Calculate the larger/smaller ratios.

</ins><span class="cx" style="display: block; padding: 0 10px">         $smaller_ratio = min( $width_ratio, $height_ratio );

</span><span class="cx" style="display: block; padding: 0 10px">        $larger_ratio  = max( $width_ratio, $height_ratio );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -466,18 +466,22 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $w = max( 1, (int) round( $current_width * $ratio ) );

</span><span class="cx" style="display: block; padding: 0 10px">        $h = max( 1, (int) round( $current_height * $ratio ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Sometimes, due to rounding, we'll end up with a result like this: 465x700 in a 177x177 box is 117x176... a pixel short

-       // We also have issues with recursive calls resulting in an ever-changing result. Constraining to the result of a constraint should yield the original result.

-       // Thus we look for dimensions that are one pixel shy of the max value and bump them up

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*

+        * Sometimes, due to rounding, we'll end up with a result like this:

+        * 465x700 in a 177x177 box is 117x176... a pixel short.

+        * We also have issues with recursive calls resulting in an ever-changing result.

+        * Constraining to the result of a constraint should yield the original result.

+        * Thus we look for dimensions that are one pixel shy of the max value and bump them up.

+        */

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">        // Note: $did_width means it is possible $smaller_ratio == $width_ratio.

</span><span class="cx" style="display: block; padding: 0 10px">        if ( $did_width && $w === $max_width - 1 ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $w = $max_width; // Round it up

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $w = $max_width; // Round it up.

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">        // Note: $did_height means it is possible $smaller_ratio == $height_ratio.

</span><span class="cx" style="display: block; padding: 0 10px">        if ( $did_height && $h === $max_height - 1 ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $h = $max_height; // Round it up

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $h = $max_height; // Round it up.

</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">@@ -528,7 +532,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        if ( $orig_w <= 0 || $orig_h <= 0 ) {

</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">-        // at least one of dest_w or dest_h must be specific

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // At least one of $dest_w or $dest_h must be specific.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( $dest_w <= 0 && $dest_h <= 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">@@ -571,12 +575,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( $crop ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Crop the largest possible portion of the original image that we can size to $dest_w x $dest_h.

-               // Note that the requested crop dimensions are used as a maximum bounding box for the original image.

-               // If the original image's width or height is less than the requested width or height

-               // only the greater one will be cropped.

-               // For example when the original image is 600x300, and the requested crop dimensions are 400x400,

-               // the resulting image will be 400x300.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /*

+                * Crop the largest possible portion of the original image that we can size to $dest_w x $dest_h.

+                * Note that the requested crop dimensions are used as a maximum bounding box for the original image.

+                * If the original image's width or height is less than the requested width or height

+                * only the greater one will be cropped.

+                * For example when the original image is 600x300, and the requested crop dimensions are 400x400,

+                * the resulting image will be 400x300.

+                */

</ins><span class="cx" style="display: block; padding: 0 10px">                 $aspect_ratio = $orig_w / $orig_h;

</span><span class="cx" style="display: block; padding: 0 10px">                $new_w        = min( $dest_w, $orig_w );

</span><span class="cx" style="display: block; padding: 0 10px">                $new_h        = min( $dest_h, $orig_h );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -821,7 +827,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">-        // include the full filesystem path of the intermediate file

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Include the full filesystem path of the intermediate file.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( empty( $data['path'] ) && ! empty( $data['file'] ) && ! empty( $imagedata['file'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $file_url     = wp_get_attachment_url( $post_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $data['path'] = path_join( dirname( $imagedata['file'] ), $data['file'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -944,7 +950,7 @@

<span class="cx" style="display: block; padding: 0 10px">  * @return array|false Returns an array (url, width, height, is_intermediate), or false if no image is available.

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function wp_get_attachment_image_src( $attachment_id, $size = 'thumbnail', $icon = false ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // get a thumbnail or intermediate image if there is one

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Get a thumbnail or intermediate image if there is one.

</ins><span class="cx" style="display: block; padding: 0 10px">         $image = image_downsize( $attachment_id, $size );

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! $image ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $src = false;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1089,7 +1095,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 ( false !== strpos( $dirname, 'wp-content/uploads' ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Get the directory name relative to the upload directory (back compat for pre-2.7 uploads)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Get the directory name relative to the upload directory (back compat for pre-2.7 uploads).

</ins><span class="cx" style="display: block; padding: 0 10px">                 $dirname = substr( $dirname, strpos( $dirname, 'wp-content/uploads' ) + 18 );

</span><span class="cx" style="display: block; padding: 0 10px">                $dirname = ltrim( $dirname, '/' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1740,7 +1746,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $class = trim( 'wp-caption ' . $atts['align'] . ' ' . $atts['class'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $html5 = current_theme_supports( 'html5', 'caption' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // HTML5 captions never added the extra 10px to the image width

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // HTML5 captions never added the extra 10px to the image width.

</ins><span class="cx" style="display: block; padding: 0 10px">         $width = $html5 ? $atts['width'] : ( 10 + $atts['width'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2261,7 +2267,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                return $output;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $outer = 22; // default padding and border of wrapper

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $outer = 22; // Default padding and border of wrapper.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $default_width  = 640;

</span><span class="cx" style="display: block; padding: 0 10px">        $default_height = 360;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2271,7 +2277,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $data = array(

</span><span class="cx" style="display: block; padding: 0 10px">                'type'         => $atts['type'],

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // don't pass strings to JSON, will be truthy in JS

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Don't pass strings to JSON, will be truthy in JS.

</ins><span class="cx" style="display: block; padding: 0 10px">                 'tracklist'    => wp_validate_boolean( $atts['tracklist'] ),

</span><span class="cx" style="display: block; padding: 0 10px">                'tracknumbers' => wp_validate_boolean( $atts['tracknumbers'] ),

</span><span class="cx" style="display: block; padding: 0 10px">                'images'       => wp_validate_boolean( $atts['images'] ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2601,7 +2607,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                'style'    => $atts['style'],

</span><span class="cx" style="display: block; padding: 0 10px">        );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // These ones should just be omitted altogether if they are blank

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // These ones should just be omitted altogether if they are blank.

</ins><span class="cx" style="display: block; padding: 0 10px">         foreach ( array( 'loop', 'autoplay', 'preload' ) as $a ) {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( empty( $html_atts[ $a ] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        unset( $html_atts[ $a ] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2754,13 +2760,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $atts = shortcode_atts( $defaults_atts, $attr, 'video' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( is_admin() ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // shrink the video so it isn't huge in the admin

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Shrink the video so it isn't huge in the admin.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $atts['width'] > $defaults_atts['width'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $atts['height'] = round( ( $atts['height'] * $defaults_atts['width'] ) / $atts['width'] );

</span><span class="cx" style="display: block; padding: 0 10px">                        $atts['width']  = $defaults_atts['width'];

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        } else {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // if the video is bigger than the theme

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If the video is bigger than the theme.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! empty( $content_width ) && $atts['width'] > $content_width ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $atts['height'] = round( ( $atts['height'] * $content_width ) / $atts['width'] );

</span><span class="cx" style="display: block; padding: 0 10px">                        $atts['width']  = $content_width;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2831,8 +2837,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                wp_enqueue_script( 'mediaelement-vimeo' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Mediaelement has issues with some URL formats for Vimeo and YouTube, so

-       // update the URL to prevent the ME.js player from breaking.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // MediaElement.js has issues with some URL formats for Vimeo and YouTube,

+       // so update the URL to prevent the ME.js player from breaking.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( 'mediaelement' === $library ) {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $is_youtube ) {

<span class="cx" style="display: block; padding: 0 10px">                        // Remove `feature` query arg and force SSL - see #40866.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2871,7 +2877,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                'preload'  => $atts['preload'],

</span><span class="cx" style="display: block; padding: 0 10px">        );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // These ones should just be omitted altogether if they are blank

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // These ones should just be omitted altogether if they are blank.

</ins><span class="cx" style="display: block; padding: 0 10px">         foreach ( array( 'poster', 'loop', 'autoplay', 'preload' ) as $a ) {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( empty( $html_atts[ $a ] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        unset( $html_atts[ $a ] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3131,7 +3137,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> /**

</span><span class="cx" style="display: block; padding: 0 10px">  * Create new GD image resource with transparency support

</span><span class="cx" style="display: block; padding: 0 10px">  *

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @todo: Deprecate if possible.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @todo Deprecate if possible.

</ins><span class="cx" style="display: block; padding: 0 10px">  *

</span><span class="cx" style="display: block; padding: 0 10px">  * @since 2.9.0

</span><span class="cx" style="display: block; padding: 0 10px">  *

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3325,7 +3331,7 @@

<span class="cx" style="display: block; padding: 0 10px">         * and the `flash_swf_url` and `silverlight_xap_url` are not used.

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        $defaults = array(

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                'file_data_name' => 'async-upload', // key passed to $_FILE.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         'file_data_name' => 'async-upload', // Key passed to $_FILE.

</ins><span class="cx" style="display: block; padding: 0 10px">                 'url'            => admin_url( 'async-upload.php', 'relative' ),

</span><span class="cx" style="display: block; padding: 0 10px">                'filters'        => array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'max_file_size' => $max_upload_size . 'b',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3333,8 +3339,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                ),

</span><span class="cx" style="display: block; padding: 0 10px">        );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Currently only iOS Safari supports multiple files uploading but iOS 7.x has a bug that prevents uploading of videos

-       // when enabled. See #29602.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*

+        * Currently only iOS Safari supports multiple files uploading,

+        * but iOS 7.x has a bug that prevents uploading of videos when enabled.

+        * See #29602.

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( wp_is_mobile() && strpos( $_SERVER['HTTP_USER_AGENT'], 'OS 7_' ) !== false &&

</span><span class="cx" style="display: block; padding: 0 10px">                strpos( $_SERVER['HTTP_USER_AGENT'], 'like Mac OS X' ) !== false ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3511,10 +3520,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                unset( $possible_sizes['full'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Loop through all potential sizes that may be chosen. Try to do this with some efficiency.

-               // First: run the image_downsize filter. If it returns something, we can use its data.

-               // If the filter does not return something, then image_downsize() is just an expensive

-               // way to check the image metadata, which we do second.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /*

+                * Loop through all potential sizes that may be chosen. Try to do this with some efficiency.

+                * First: run the image_downsize filter. If it returns something, we can use its data.

+                * If the filter does not return something, then image_downsize() is just an expensive way

+                * to check the image metadata, which we do second.

+                */

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $possible_sizes as $size => $label ) {

</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/media.php */

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3669,9 +3680,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">        unset( $tabs['type'], $tabs['type_url'], $tabs['gallery'], $tabs['library'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $props = array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                'link'  => get_option( 'image_default_link_type' ), // db default is 'file'

-               'align' => get_option( 'image_default_align' ), // empty default

-               'size'  => get_option( 'image_default_size' ),  // empty default

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         'link'  => get_option( 'image_default_link_type' ), // DB default is 'file'.

+               'align' => get_option( 'image_default_align' ),     // Empty default.

+               'size'  => get_option( 'image_default_size' ),      // Empty default.

</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">        $exts      = array_merge( wp_get_audio_extensions(), wp_get_video_extensions() );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3840,7 +3851,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">        $strings = array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Generic

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Generic.

</ins><span class="cx" style="display: block; padding: 0 10px">                 'mediaFrameDefaultTitle'      => __( 'Media' ),

</span><span class="cx" style="display: block; padding: 0 10px">                'url'                         => __( 'URL' ),

</span><span class="cx" style="display: block; padding: 0 10px">                'addMedia'                    => __( 'Add Media' ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3859,11 +3870,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                'selected'                    => __( '%d selected' ),

</span><span class="cx" style="display: block; padding: 0 10px">                'dragInfo'                    => __( 'Drag and drop to reorder media files.' ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Upload

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Upload.

</ins><span class="cx" style="display: block; padding: 0 10px">                 'uploadFilesTitle'            => __( 'Upload Files' ),

</span><span class="cx" style="display: block; padding: 0 10px">                'uploadImagesTitle'           => __( 'Upload Images' ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Library

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Library.

</ins><span class="cx" style="display: block; padding: 0 10px">                 'mediaLibraryTitle'           => __( 'Media Library' ),

</span><span class="cx" style="display: block; padding: 0 10px">                'insertMediaTitle'            => __( 'Add Media' ),

</span><span class="cx" style="display: block; padding: 0 10px">                'createNewGallery'            => __( 'Create a new gallery' ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3889,24 +3900,24 @@

</span><span class="cx" style="display: block; padding: 0 10px">                'filterByDate'                => __( 'Filter by date' ),

</span><span class="cx" style="display: block; padding: 0 10px">                'filterByType'                => __( 'Filter by type' ),

</span><span class="cx" style="display: block; padding: 0 10px">                'searchLabel'                 => __( 'Search' ),

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                'searchMediaLabel'            => __( 'Search Media' ), // backwards compatibility pre-5.3

-               'searchMediaPlaceholder'      => __( 'Search media items...' ), // placeholder (no ellipsis), backwards compatibility pre-5.3

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         'searchMediaLabel'            => __( 'Search Media' ),          // Backward compatibility pre-5.3.

+               'searchMediaPlaceholder'      => __( 'Search media items...' ), // Placeholder (no ellipsis), backward compatibility pre-5.3.

</ins><span class="cx" style="display: block; padding: 0 10px">                 'mediaFound'                  => __( 'Number of media items found: %d' ),

</span><span class="cx" style="display: block; padding: 0 10px">                'mediaFoundHasMoreResults'    => __( 'Number of media items displayed: %d. Scroll the page for more results.' ),

</span><span class="cx" style="display: block; padding: 0 10px">                'noMedia'                     => __( 'No media items found.' ),

</span><span class="cx" style="display: block; padding: 0 10px">                'noMediaTryNewSearch'         => __( 'No media items found. Try a different search.' ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Library Details

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Library Details.

</ins><span class="cx" style="display: block; padding: 0 10px">                 'attachmentDetails'           => __( 'Attachment Details' ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // From URL

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // From URL.

</ins><span class="cx" style="display: block; padding: 0 10px">                 'insertFromUrlTitle'          => __( 'Insert from URL' ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Featured Images

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Featured Images.

</ins><span class="cx" style="display: block; padding: 0 10px">                 'setFeaturedImageTitle'       => $post_type_object->labels->featured_image,

</span><span class="cx" style="display: block; padding: 0 10px">                'setFeaturedImage'            => $post_type_object->labels->set_featured_image,

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Gallery

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Gallery.

</ins><span class="cx" style="display: block; padding: 0 10px">                 'createGalleryTitle'          => __( 'Create Gallery' ),

</span><span class="cx" style="display: block; padding: 0 10px">                'editGalleryTitle'            => __( 'Edit Gallery' ),

</span><span class="cx" style="display: block; padding: 0 10px">                'cancelGalleryTitle'          => __( '&#8592; Cancel Gallery' ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3916,13 +3927,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                'addToGalleryTitle'           => __( 'Add to Gallery' ),

</span><span class="cx" style="display: block; padding: 0 10px">                'reverseOrder'                => __( 'Reverse order' ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Edit Image

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Edit Image.

</ins><span class="cx" style="display: block; padding: 0 10px">                 'imageDetailsTitle'           => __( 'Image Details' ),

</span><span class="cx" style="display: block; padding: 0 10px">                'imageReplaceTitle'           => __( 'Replace Image' ),

</span><span class="cx" style="display: block; padding: 0 10px">                'imageDetailsCancel'          => __( 'Cancel Edit' ),

</span><span class="cx" style="display: block; padding: 0 10px">                'editImage'                   => __( 'Edit Image' ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Crop Image

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Crop Image.

</ins><span class="cx" style="display: block; padding: 0 10px">                 'chooseImage'                 => __( 'Choose Image' ),

</span><span class="cx" style="display: block; padding: 0 10px">                'selectAndCrop'               => __( 'Select and Crop' ),

</span><span class="cx" style="display: block; padding: 0 10px">                'skipCropping'                => __( 'Skip Cropping' ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3933,13 +3944,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                'suggestedDimensions'         => __( 'Suggested image dimensions: %1$s by %2$s pixels.' ),

</span><span class="cx" style="display: block; padding: 0 10px">                'cropError'                   => __( 'There has been an error cropping your image.' ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Edit Audio

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Edit Audio.

</ins><span class="cx" style="display: block; padding: 0 10px">                 'audioDetailsTitle'           => __( 'Audio Details' ),

</span><span class="cx" style="display: block; padding: 0 10px">                'audioReplaceTitle'           => __( 'Replace Audio' ),

</span><span class="cx" style="display: block; padding: 0 10px">                'audioAddSourceTitle'         => __( 'Add Audio Source' ),

</span><span class="cx" style="display: block; padding: 0 10px">                'audioDetailsCancel'          => __( 'Cancel Edit' ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Edit Video

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Edit Video.

</ins><span class="cx" style="display: block; padding: 0 10px">                 'videoDetailsTitle'           => __( 'Video Details' ),

</span><span class="cx" style="display: block; padding: 0 10px">                'videoReplaceTitle'           => __( 'Replace Video' ),

</span><span class="cx" style="display: block; padding: 0 10px">                'videoAddSourceTitle'         => __( 'Add Video Source' ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3947,7 +3958,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                'videoSelectPosterImageTitle' => __( 'Select Poster Image' ),

</span><span class="cx" style="display: block; padding: 0 10px">                'videoAddTrackTitle'          => __( 'Add Subtitles' ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Playlist

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Playlist.

</ins><span class="cx" style="display: block; padding: 0 10px">                 'playlistDragInfo'            => __( 'Drag and drop to reorder tracks.' ),

</span><span class="cx" style="display: block; padding: 0 10px">                'createPlaylistTitle'         => __( 'Create Audio Playlist' ),

</span><span class="cx" style="display: block; padding: 0 10px">                'editPlaylistTitle'           => __( 'Edit Audio Playlist' ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3957,7 +3968,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                'addToPlaylist'               => __( 'Add to audio playlist' ),

</span><span class="cx" style="display: block; padding: 0 10px">                'addToPlaylistTitle'          => __( 'Add to Audio Playlist' ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Video Playlist

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Video Playlist.

</ins><span class="cx" style="display: block; padding: 0 10px">                 'videoPlaylistDragInfo'       => __( 'Drag and drop to reorder videos.' ),

</span><span class="cx" style="display: block; padding: 0 10px">                'createVideoPlaylistTitle'    => __( 'Create Video Playlist' ),

</span><span class="cx" style="display: block; padding: 0 10px">                'editVideoPlaylistTitle'      => __( 'Edit Video Playlist' ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3967,7 +3978,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                'addToVideoPlaylist'          => __( 'Add to video playlist' ),

</span><span class="cx" style="display: block; padding: 0 10px">                'addToVideoPlaylistTitle'     => __( 'Add to Video Playlist' ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Headings

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Headings.

</ins><span class="cx" style="display: block; padding: 0 10px">                 'filterAttachments'           => __( 'Filter Media' ),

</span><span class="cx" style="display: block; padding: 0 10px">                'attachmentsList'             => __( 'Media list' ),

</span><span class="cx" style="display: block; padding: 0 10px">        );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3994,8 +4005,8 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $strings['settings'] = $settings;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Ensure we enqueue media-editor first, that way media-views is

-       // registered internally before we try to localize it. see #24724.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Ensure we enqueue media-editor first, that way media-views

+       // is registered internally before we try to localize it. See #24724.

</ins><span class="cx" style="display: block; padding: 0 10px">         wp_enqueue_script( 'media-editor' );

</span><span class="cx" style="display: block; padding: 0 10px">        wp_localize_script( 'media-views', '_wpMediaViewsL10n', $strings );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4285,7 +4296,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $site_url   = parse_url( $dir['url'] );

</span><span class="cx" style="display: block; padding: 0 10px">        $image_path = parse_url( $path );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        //force the protocols to match if needed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Force the protocols to match if needed.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( isset( $image_path['scheme'] ) && ( $image_path['scheme'] !== $site_url['scheme'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $path = str_replace( $image_path['scheme'], $site_url['scheme'], $path );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4436,8 +4447,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">  * @access private

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function _wp_add_additional_image_sizes() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // 2x medium_large size

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // 2x medium_large size.

</ins><span class="cx" style="display: block; padding: 0 10px">         add_image_size( '1536x1536', 1536, 1536 );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // 2x large size

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // 2x large size.

</ins><span class="cx" style="display: block; padding: 0 10px">         add_image_size( '2048x2048', 2048, 2048 );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/meta.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -718,7 +718,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $meta_subtype = get_object_subtype( $meta_type, $object_id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Sanitize the meta

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Sanitize the meta.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_meta_value = $meta_value;

</span><span class="cx" style="display: block; padding: 0 10px">                $meta_value  = sanitize_meta( $meta_key, $meta_value, $meta_type, $meta_subtype );

</span><span class="cx" style="display: block; padding: 0 10px">                $meta_value  = maybe_serialize( $meta_value );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -794,7 +794,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">-        // object and id columns

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Object and ID columns.

</ins><span class="cx" style="display: block; padding: 0 10px">         $column    = sanitize_key( $meta_type . '_id' );

</span><span class="cx" style="display: block; padding: 0 10px">        $id_column = 'user' == $meta_type ? 'umeta_id' : 'meta_id';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -838,7 +838,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        do_action( "delete_{$meta_type}meta", $meta_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">-                // Run the query, will return true if deleted, false otherwise

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Run the query, will return true if deleted, false otherwise.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $result = (bool) $wpdb->delete( $table, array( $id_column => $meta_id ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Clear the caches.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -866,7 +866,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"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Meta id was not found.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Meta ID was not found.

</ins><span class="cx" style="display: block; padding: 0 10px">         return false;

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -935,7 +935,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                return $cache;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Get meta info

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Get meta info.

</ins><span class="cx" style="display: block; padding: 0 10px">         $id_list   = join( ',', $ids );

</span><span class="cx" style="display: block; padding: 0 10px">        $id_column = 'user' == $meta_type ? 'umeta_id' : 'meta_id';

</span><span class="cx" style="display: block; padding: 0 10px">        $meta_list = $wpdb->get_results( "SELECT $column, meta_key, meta_value FROM $table WHERE $column IN ($id_list) ORDER BY $id_column ASC", ARRAY_A );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -946,7 +946,7 @@

</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Force subkeys to be array type:

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Force subkeys to be array type.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( ! isset( $cache[ $mpid ] ) || ! is_array( $cache[ $mpid ] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $cache[ $mpid ] = array();

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -954,7 +954,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                $cache[ $mpid ][ $mkey ] = array();

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Add a value to the current pid/key:

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Add a value to the current pid/key.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $cache[ $mpid ][ $mkey ][] = $mval;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1160,7 +1160,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                'show_in_rest'      => 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">-        // There used to be individual args for sanitize and auth callbacks

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // There used to be individual args for sanitize and auth callbacks.

</ins><span class="cx" style="display: block; padding: 0 10px">         $has_old_sanitize_cb = false;

</span><span class="cx" style="display: block; padding: 0 10px">        $has_old_auth_cb     = false;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1298,7 +1298,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        unset( $wp_meta_keys[ $object_type ][ $object_subtype ][ $meta_key ] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Do some clean up

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Do some clean up.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( empty( $wp_meta_keys[ $object_type ][ $object_subtype ] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                unset( $wp_meta_keys[ $object_type ][ $object_subtype ] );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span></span></pre></div>

<a id="trunksrcwpincludesmsblogsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/ms-blogs.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-blogs.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/ms-blogs.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -581,7 +581,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        if ( $new_blog_id == $prev_blog_id ) {

</span><span class="cx" style="display: block; padding: 0 10px">                /** This filter is documented in wp-includes/ms-blogs.php */

</span><span class="cx" style="display: block; padding: 0 10px">                do_action( 'switch_blog', $new_blog_id, $prev_blog_id, 'restore' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If we still have items in the switched stack, consider ourselves still 'switched'

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If we still have items in the switched stack, consider ourselves still 'switched'.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $GLOBALS['switched'] = ! empty( $GLOBALS['_wp_switched_stack'] );

</span><span class="cx" style="display: block; padding: 0 10px">                return true;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -616,7 +616,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        /** This filter is documented in wp-includes/ms-blogs.php */

</span><span class="cx" style="display: block; padding: 0 10px">        do_action( 'switch_blog', $new_blog_id, $prev_blog_id, 'restore' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // If we still have items in the switched stack, consider ourselves still 'switched'

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If we still have items in the switched stack, consider ourselves still 'switched'.

</ins><span class="cx" style="display: block; padding: 0 10px">         $GLOBALS['switched'] = ! empty( $GLOBALS['_wp_switched_stack'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        return true;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -760,7 +760,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        global $wpdb;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! empty( $deprecated ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                _deprecated_argument( __FUNCTION__, 'MU' ); // never used

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         _deprecated_argument( __FUNCTION__, 'MU' ); // Never used.

</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 $wpdb->get_results( $wpdb->prepare( "SELECT blog_id, domain, path FROM $wpdb->blogs WHERE site_id = %d AND public = '1' AND archived = '0' AND mature = '0' AND spam = '0' AND deleted = '0' AND last_updated != '0000-00-00 00:00:00' ORDER BY last_updated DESC limit %d, %d", get_current_network_id(), $start, $quantity ), ARRAY_A );

</span></span></pre></div>

<a id="trunksrcwpincludesmsdefaultconstantsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/ms-default-constants.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-default-constants.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/ms-default-constants.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,7 +23,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                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">-        // Base uploads dir relative to ABSPATH

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Base uploads dir relative to ABSPATH.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! defined( 'UPLOADBLOGSDIR' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                define( 'UPLOADBLOGSDIR', 'wp-content/blogs.dir' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</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"> 

</span><span class="cx" style="display: block; padding: 0 10px">                define( 'UPLOADS', UPLOADBLOGSDIR . '/' . $site_id . '/files/' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Uploads dir relative to ABSPATH

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Uploads dir relative to ABSPATH.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( 'wp-content/blogs.dir' == UPLOADBLOGSDIR && ! defined( 'BLOGUPLOADDIR' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        define( 'BLOGUPLOADDIR', WP_CONTENT_DIR . '/blogs.dir/' . $site_id . '/files/' );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span></span></pre></div>

<a id="trunksrcwpincludesmsdefaultfiltersphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/ms-default-filters.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-default-filters.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/ms-default-filters.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,12 +15,12 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'init', 'ms_subdomain_constants' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Functions

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Functions.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'update_option_blog_public', 'update_blog_public', 10, 2 );

</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'option_users_can_register', 'users_can_register_signup_filter' );

</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'site_option_welcome_user_email', 'welcome_user_msg_filter' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Users

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Users.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wpmu_validate_user_signup', 'signup_nonce_check' );

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'init', 'maybe_add_existing_user_to_blog' );

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wpmu_new_user', 'newuser_notify_siteadmin' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,10 +32,10 @@

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'network_user_new_created_user', 'wp_send_new_user_notifications' );

</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'sanitize_user', 'strtolower' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Roles

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Roles.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'switch_blog', 'wp_switch_roles_and_user', 1, 2 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Blogs

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Blogs.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wpmu_validate_blog_signup', 'signup_nonce_check' );

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wpmu_activate_blog', 'wpmu_welcome_notification', 10, 5 );

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'after_signup_site', 'wpmu_signup_blog_notification', 10, 7 );

</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"> add_action( 'wp_uninitialize_site', 'wp_uninitialize_site', 10, 1 );

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'update_blog_public', 'wp_update_blog_public_option_on_site_update', 1, 2 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Site meta

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Site meta.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'added_blog_meta', 'wp_cache_set_sites_last_changed' );

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'updated_blog_meta', 'wp_cache_set_sites_last_changed' );

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'deleted_blog_meta', 'wp_cache_set_sites_last_changed' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,14 +66,14 @@

</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'delete_blog_metadata_by_mid', 'wp_check_site_meta_support_prefilter' );

</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'update_blog_metadata_cache', 'wp_check_site_meta_support_prefilter' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Register Nonce

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Register nonce.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'signup_hidden_fields', 'signup_nonce_fields' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Template

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Template.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'template_redirect', 'maybe_redirect_404' );

</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'allowed_redirect_hosts', 'redirect_this_site' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Administration

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Administration.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'term_id_filter', 'global_terms', 10, 2 );

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'delete_post', '_update_posts_count_on_delete' );

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'delete_post', '_update_blog_date_on_post_delete' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,7 +80,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'transition_post_status', '_update_blog_date_on_post_publish', 10, 3 );

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'transition_post_status', '_update_posts_count_on_transition_post_status', 10, 3 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Counts

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Counts.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'admin_init', 'wp_schedule_update_network_counts' );

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'update_network_counts', 'wp_update_network_counts', 10, 0 );

</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array( 'user_register', 'deleted_user', 'wpmu_new_user', 'make_spam_user', 'make_ham_user' ) as $action ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,7 +91,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> unset( $action );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Files

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Files.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_upload_bits', 'upload_is_file_too_big' );

</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'import_upload_size_limit', 'fix_import_form_size' );

</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'upload_mimes', 'check_upload_mimes' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -98,20 +98,20 @@

</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'upload_size_limit', 'upload_size_limit_filter' );

</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'upload_ui_over_quota', 'multisite_over_quota_message' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Mail

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Mail.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'phpmailer_init', 'fix_phpmailer_messageid' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Disable somethings by default for multisite

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Disable somethings by default for multisite.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'enable_update_services_configuration', '__return_false' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( ! defined( 'POST_BY_EMAIL' ) || ! POST_BY_EMAIL ) { // back compat constant.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( ! defined( 'POST_BY_EMAIL' ) || ! POST_BY_EMAIL ) { // Back compat constant.

</ins><span class="cx" style="display: block; padding: 0 10px">         add_filter( 'enable_post_by_email_configuration', '__return_false' );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( ! defined( 'EDIT_ANY_USER' ) || ! EDIT_ANY_USER ) { // back compat constant.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( ! defined( 'EDIT_ANY_USER' ) || ! EDIT_ANY_USER ) { // Back compat constant.

</ins><span class="cx" style="display: block; padding: 0 10px">         add_filter( 'enable_edit_any_user_configuration', '__return_false' );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'force_filtered_html_on_import', '__return_true' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// WP_HOME and WP_SITEURL should not have any effect in MS

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// WP_HOME and WP_SITEURL should not have any effect in MS.

</ins><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'option_siteurl', '_config_wp_siteurl' );

</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'option_home', '_config_wp_home' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,5 +124,5 @@

<span class="cx" style="display: block; padding: 0 10px"> // If the network upgrade hasn't run yet, assume ms-files.php rewriting is used.

</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'default_site_option_ms_files_rewriting', '__return_true' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Whitelist multisite domains for HTTP requests

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Whitelist multisite domains for HTTP requests.

</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'http_request_host_is_external', 'ms_allowed_http_request_hosts', 20, 2 );

</span></span></pre></div>

<a id="trunksrcwpincludesmsdeprecatedphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/ms-deprecated.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-deprecated.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/ms-deprecated.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -226,7 +226,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $blog_list = array();

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( (array) $blogs as $key => $details ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $most_active[ $details['blog_id'] ] = $details['postcount'];

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $blog_list[ $details['blog_id'] ] = $details; // array_slice() removes keys!!

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $blog_list[ $details['blog_id'] ] = $details; // array_slice() removes keys!

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px">                arsort( $most_active );

</span><span class="cx" style="display: block; padding: 0 10px">                reset( $most_active );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -371,10 +371,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $domain != $_SERVER['HTTP_HOST'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $blogname = substr( $domain, 0, strpos( $domain, '.' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $url = 'http://' . substr( $domain, strpos( $domain, '.' ) + 1 ) . $path;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // we're not installing the main blog

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // We're not installing the main blog.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( $blogname != 'www.' )

</span><span class="cx" style="display: block; padding: 0 10px">                                $url .= $blogname . '/';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                } else { // main blog

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         } else { // Main blog.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $url = 'http://' . $domain . $path;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -403,9 +403,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">        if ( domain_exists($domain, $path, $site_id) )

</span><span class="cx" style="display: block; padding: 0 10px">                return __( '<strong>ERROR</strong>: Site URL already taken.' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Need to back up wpdb table names, and create a new wp_blogs entry for new blog.

-       // Need to get blog_id from wp_blogs, and create new table names.

-       // Must restore table names at the end of function.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*

+        * Need to back up wpdb table names, and create a new wp_blogs entry for new blog.

+        * Need to get blog_id from wp_blogs, and create new table names.

+        * Must restore table names at the end of function.

+        */

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! $blog_id = insert_blog($domain, $path, $site_id) )

</span><span class="cx" style="display: block; padding: 0 10px">                return __( '<strong>ERROR</strong>: problem creating site entry.' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -494,7 +496,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $args = wp_parse_args( $args, $defaults );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Backwards compatibility

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Backward compatibility.

</ins><span class="cx" style="display: block; padding: 0 10px">         if( is_array( $args['network_id'] ) ){

</span><span class="cx" style="display: block; padding: 0 10px">                $args['network__in'] = $args['network_id'];

</span><span class="cx" style="display: block; padding: 0 10px">                $args['network_id'] = null;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -605,7 +607,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        _deprecated_function( __FUNCTION__, '5.1.0' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Cast for security

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Cast for security.

</ins><span class="cx" style="display: block; padding: 0 10px">         $blog_id = (int) $blog_id;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -618,7 +620,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $url = get_blogaddress_by_id( $blog_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">-        // Set everything up

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Set everything up.

</ins><span class="cx" style="display: block; padding: 0 10px">         make_db_current_silent( 'blog' );

</span><span class="cx" style="display: block; padding: 0 10px">        populate_options();

</span><span class="cx" style="display: block; padding: 0 10px">        populate_roles();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -650,10 +652,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">        update_option( 'blogname', wp_unslash( $blog_title ) );

</span><span class="cx" style="display: block; padding: 0 10px">        update_option( 'admin_email', '' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // remove all perms

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Remove all permissions.

</ins><span class="cx" style="display: block; padding: 0 10px">         $table_prefix = $wpdb->get_blog_prefix();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        delete_metadata( 'user', 0, $table_prefix . 'user_level', null, true ); // delete all

-       delete_metadata( 'user', 0, $table_prefix . 'capabilities', null, true ); // delete all

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ delete_metadata( 'user', 0, $table_prefix . 'user_level', null, true );   // Delete all.

+       delete_metadata( 'user', 0, $table_prefix . 'capabilities', null, true ); // Delete all.

</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="trunksrcwpincludesmsfilesphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/ms-files.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-files.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/ms-files.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,12 +41,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $mimetype = 'image/' . substr( $file, strrpos( $file, '.' ) + 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">-header( 'Content-Type: ' . $mimetype ); // always send this

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+header( 'Content-Type: ' . $mimetype ); // Always send this.

</ins><span class="cx" style="display: block; padding: 0 10px"> if ( false === strpos( $_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">        header( 'Content-Length: ' . filesize( $file ) );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Optional support for X-Sendfile and X-Accel-Redirect

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Optional support for X-Sendfile and X-Accel-Redirect.

</ins><span class="cx" style="display: block; padding: 0 10px"> if ( WPMU_ACCEL_REDIRECT ) {

</span><span class="cx" style="display: block; padding: 0 10px">        header( 'X-Accel-Redirect: ' . str_replace( WP_CONTENT_DIR, '', $file ) );

</span><span class="cx" style="display: block; padding: 0 10px">        exit;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -61,7 +61,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> header( 'ETag: ' . $etag );

</span><span class="cx" style="display: block; padding: 0 10px"> header( 'Expires: ' . gmdate( 'D, d M Y H:i:s', time() + 100000000 ) . ' GMT' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Support for Conditional GET - use stripslashes to avoid formatting.php dependency

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Support for conditional GET - use stripslashes() to avoid formatting.php dependency.

</ins><span class="cx" style="display: block; padding: 0 10px"> $client_etag = isset( $_SERVER['HTTP_IF_NONE_MATCH'] ) ? stripslashes( $_SERVER['HTTP_IF_NONE_MATCH'] ) : false;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -69,7 +69,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> $client_last_modified = trim( $_SERVER['HTTP_IF_MODIFIED_SINCE'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// If string is empty, return 0. If not, attempt to parse into a timestamp

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// If string is empty, return 0. If not, attempt to parse into a timestamp.

</ins><span class="cx" style="display: block; padding: 0 10px"> $client_modified_timestamp = $client_last_modified ? strtotime( $client_last_modified ) : 0;

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px"> // Make a timestamp for our most recent modification...

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,6 +83,6 @@

</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// If we made it this far, just serve the file

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// If we made it this far, just serve the file.

</ins><span class="cx" style="display: block; padding: 0 10px"> readfile( $file );

</span><span class="cx" style="display: block; padding: 0 10px"> flush();

</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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/ms-functions.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,7 +62,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $primary = get_site( $primary_blog );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        } else {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //TODO Review this call to add_user_to_blog too - to get here the user must have a role on this blog?

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // TODO: Review this call to add_user_to_blog too - to get here the user must have a role on this blog?

</ins><span class="cx" style="display: block; padding: 0 10px">                 $result = add_user_to_blog( $first_blog->userblog_id, $user_id, 'subscriber' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! is_wp_error( $result ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,7 +72,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ( ! is_object( $primary ) ) || ( $primary->archived == 1 || $primary->spam == 1 || $primary->deleted == 1 ) ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $blogs = get_blogs_of_user( $user_id, true ); // if a user's primary blog is shut down, check their other blogs.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $blogs = get_blogs_of_user( $user_id, true ); // If a user's primary blog is shut down, check their other blogs.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $ret   = false;

</span><span class="cx" style="display: block; padding: 0 10px">                if ( is_array( $blogs ) && count( $blogs ) > 0 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        foreach ( (array) $blogs as $blog_id => $blog ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -273,7 +273,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                update_user_meta( $user_id, 'source_domain', $new_domain );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // wp_revoke_user($user_id);

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // wp_revoke_user( $user_id );

</ins><span class="cx" style="display: block; padding: 0 10px">         $user = get_userdata( $user_id );

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! $user ) {

</span><span class="cx" style="display: block; padding: 0 10px">                restore_current_blog();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -347,7 +347,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $path   = strtolower( $path );

</span><span class="cx" style="display: block; padding: 0 10px">        $id     = wp_cache_get( md5( $domain . $path ), 'blog-id-cache' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        if ( $id == -1 ) { // blog does not exist

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $id == -1 ) { // Blog does not exist.

</ins><span class="cx" style="display: block; padding: 0 10px">                 return 0;

</span><span class="cx" style="display: block; padding: 0 10px">        } elseif ( $id ) {

</span><span class="cx" style="display: block; padding: 0 10px">                return (int) $id;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -373,7 +373,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">        return $id;

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Admin functions

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+//

+// Admin functions.

+//

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> /**

<span class="cx" style="display: block; padding: 0 10px">  * Checks an email address against a list of banned domains.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -507,7 +509,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $errors->add( 'user_name', __( 'Username may not be longer than 60 characters.' ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // all numeric?

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // All numeric?

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( preg_match( '/^[0-9]*$/', $user_name ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $errors->add( 'user_name', __( 'Sorry, usernames must have letters too!' ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -665,12 +667,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $errors->add( 'blogname', sprintf( _n( 'Site name must be at least %s character.', 'Site name must be at least %s characters.', $minimum_site_name_length ), number_format_i18n( $minimum_site_name_length ) ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // do not allow users to create a blog that conflicts with a page on the main blog.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Do not allow users to create a blog that conflicts with a page on the main blog.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! is_subdomain_install() && $wpdb->get_var( $wpdb->prepare( 'SELECT post_name FROM ' . $wpdb->get_blog_prefix( $current_network->site_id ) . "posts WHERE post_type = 'page' AND post_name = %s", $blogname ) ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $errors->add( 'blogname', __( 'Sorry, you may not use that site name.' ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // all numeric?

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // All numeric?

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( preg_match( '/^[0-9]*$/', $blogname ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $errors->add( 'blogname', __( 'Sorry, site names must have letters too!' ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -712,7 +714,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">        // Has someone already signed up for this domain?

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $signup = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->signups WHERE domain = %s AND path = %s", $mydomain, $path ) ); // TODO: Check email too?

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // TODO: Check email too?

+       $signup = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->signups WHERE domain = %s AND path = %s", $mydomain, $path ) );

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! empty( $signup ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $diff = time() - mysql2date( 'U', $signup->registered );

<span class="cx" style="display: block; padding: 0 10px">                // If registered more than two days ago, cancel registration and let this signup go through.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -840,7 +843,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> function wpmu_signup_user( $user, $user_email, $meta = array() ) {

</span><span class="cx" style="display: block; padding: 0 10px">        global $wpdb;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Format data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Format data.

</ins><span class="cx" style="display: block; padding: 0 10px">         $user       = preg_replace( '/\s+/', '', sanitize_user( $user, true ) );

</span><span class="cx" style="display: block; padding: 0 10px">        $user_email = sanitize_email( $user_email );

</span><span class="cx" style="display: block; padding: 0 10px">        $key        = substr( md5( time() . wp_rand() . $user_email ), 0, 16 );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -933,7 +936,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! is_subdomain_install() || get_current_network_id() != 1 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $activate_url = network_site_url( "wp-activate.php?key=$key" );

</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">-                $activate_url = "http://{$domain}{$path}wp-activate.php?key=$key"; // @todo use *_url() API

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $activate_url = "http://{$domain}{$path}wp-activate.php?key=$key"; // @todo Use *_url() API.

</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">        $activate_url = esc_url( $activate_url );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1212,8 +1215,11 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">        // TODO: What to do if we create a user but cannot create a blog?

</span><span class="cx" style="display: block; padding: 0 10px">        if ( is_wp_error( $blog_id ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If blog is taken, that means a previous attempt to activate this blog failed in between creating the blog and

-               // setting the activation flag. Let's just set the active flag and instruct the user to reset their password.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /*

+                * If blog is taken, that means a previous attempt to activate this blog

+                * failed in between creating the blog and setting the activation flag.

+                * Let's just set the active flag and instruct the user to reset their password.

+                */

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( 'blog_taken' == $blog_id->get_error_code() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $blog_id->add_data( $signup );

</span><span class="cx" style="display: block; padding: 0 10px">                        $wpdb->update(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1788,18 +1794,20 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $most_recent_post = array();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        // Walk through each blog and get the most recent post

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // published by $user_id

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // published by $user_id.

</ins><span class="cx" style="display: block; padding: 0 10px">         foreach ( (array) $user_blogs as $blog ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $prefix      = $wpdb->get_blog_prefix( $blog->userblog_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $recent_post = $wpdb->get_row( $wpdb->prepare( "SELECT ID, post_date_gmt FROM {$prefix}posts WHERE post_author = %d AND post_type = 'post' AND post_status = 'publish' ORDER BY post_date_gmt DESC LIMIT 1", $user_id ), ARRAY_A );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make sure we found a post

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure we found a post.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( isset( $recent_post['ID'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $post_gmt_ts = strtotime( $recent_post['post_date_gmt'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // If this is the first post checked or if this post is

-                       // newer than the current recent post, make it the new

-                       // most recent post.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 /*

+                        * If this is the first post checked

+                        * or if this post is newer than the current recent post,

+                        * make it the new most recent post.

+                        */

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( ! isset( $most_recent_post['post_gmt_ts'] ) || ( $post_gmt_ts > $most_recent_post['post_gmt_ts'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $most_recent_post = array(

</span><span class="cx" style="display: block; padding: 0 10px">                                        'blog_id'       => $blog->userblog_id,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1814,7 +1822,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">        return $most_recent_post;

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Misc functions

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+//

+// Misc functions.

+//

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> /**

<span class="cx" style="display: block; padding: 0 10px">  * Check an array of MIME types against a whitelist.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1920,7 +1930,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">-        // prevent a race condition

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Prevent a race condition.

</ins><span class="cx" style="display: block; padding: 0 10px">         $recurse_start = false;

</span><span class="cx" style="display: block; padding: 0 10px">        if ( $global_terms_recurse === null ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $recurse_start        = true;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2182,7 +2192,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! empty( $meta['add_to_blog'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $blog_id = $meta['add_to_blog'];

</span><span class="cx" style="display: block; padding: 0 10px">                $role    = $meta['new_role'];

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                remove_user_from_blog( $user_id, get_network()->site_id ); // remove user from main blog.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         remove_user_from_blog( $user_id, get_network()->site_id ); // Remove user from main blog.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $result = add_user_to_blog( $blog_id, $user_id, $role );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2316,7 +2326,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function filter_SSL( $url ) {  // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.FunctionNameInvalid

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! is_string( $url ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return get_bloginfo( 'url' ); // Return home blog url with proper scheme

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return get_bloginfo( 'url' ); // Return home blog URL with proper scheme.

</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 ( force_ssl_content() && is_ssl() ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2778,7 +2788,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                'message' => $email_change_text,

</span><span class="cx" style="display: block; padding: 0 10px">                'headers' => '',

</span><span class="cx" style="display: block; padding: 0 10px">        );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // get network name

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Get network name.

</ins><span class="cx" style="display: block; padding: 0 10px">         $network_name = wp_specialchars_decode( get_site_option( 'site_name' ), ENT_QUOTES );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span></span></pre></div>

<a id="trunksrcwpincludesmsloadphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/ms-load.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-load.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/ms-load.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -45,9 +45,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">        sort( $active_plugins );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        foreach ( $active_plugins as $plugin ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( ! validate_file( $plugin ) // $plugin must validate as file

-                       && '.php' == substr( $plugin, -4 ) // $plugin must end with '.php'

-                       && file_exists( WP_PLUGIN_DIR . '/' . $plugin ) // $plugin must exist

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( ! validate_file( $plugin )                     // $plugin must validate as file.

+                       && '.php' == substr( $plugin, -4 )              // $plugin must end with '.php'.

+                       && file_exists( WP_PLUGIN_DIR . '/' . $plugin ) // $plugin must exist.

</ins><span class="cx" style="display: block; padding: 0 10px">                         ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $plugins[] = WP_PLUGIN_DIR . '/' . $plugin;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -85,7 +85,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                return true;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Allow super admins to see blocked sites

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Allow super admins to see blocked sites.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( is_super_admin() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                return true;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -221,7 +221,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">         * @todo

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * caching, etc. Consider alternative optimization routes,

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Caching, etc. Consider alternative optimization routes,

</ins><span class="cx" style="display: block; padding: 0 10px">          * perhaps as an opt-in for plugins, rather than using the pre_* filter.

<span class="cx" style="display: block; padding: 0 10px">         * For example: The segments filter can expand or ignore paths.

</span><span class="cx" style="display: block; padding: 0 10px">         * If persistent caching is enabled, we could query the DB for a path <> '/'

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -305,7 +305,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $current_site->path   = PATH_CURRENT_SITE;

</span><span class="cx" style="display: block; padding: 0 10px">                if ( defined( 'BLOG_ID_CURRENT_SITE' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $current_site->blog_id = BLOG_ID_CURRENT_SITE;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                } elseif ( defined( 'BLOGID_CURRENT_SITE' ) ) { // deprecated.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         } elseif ( defined( 'BLOGID_CURRENT_SITE' ) ) { // Deprecated.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $current_site->blog_id = BLOGID_CURRENT_SITE;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -419,9 +419,11 @@

<span class="cx" style="display: block; padding: 0 10px">                        // For a "subdomain" installation, redirect to the signup form specifically.

</span><span class="cx" style="display: block; padding: 0 10px">                        $destination .= 'wp-signup.php?new=' . str_replace( '.' . $current_site->domain, '', $domain );

</span><span class="cx" style="display: block; padding: 0 10px">                } elseif ( $subdomain ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // For a "subdomain" installation, the NOBLOGREDIRECT constant

-                       // can be used to avoid a redirect to the signup form.

-                       // Using the ms_site_not_found action is preferred to the constant.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 /*

+                        * For a "subdomain" installation, the NOBLOGREDIRECT constant

+                        * can be used to avoid a redirect to the signup form.

+                        * Using the ms_site_not_found action is preferred to the constant.

+                        */

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( '%siteurl%' !== NOBLOGREDIRECT ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $destination = NOBLOGREDIRECT;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span></span></pre></div>

<a id="trunksrcwpincludesmssettingsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/ms-settings.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-settings.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/ms-settings.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,13 +94,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">        wp_load_core_site_options( $site_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">-$wpdb->set_prefix( $table_prefix, false ); // $table_prefix can be set in sunrise.php

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$wpdb->set_prefix( $table_prefix, false ); // $table_prefix can be set in sunrise.php.

</ins><span class="cx" style="display: block; padding: 0 10px"> $wpdb->set_blog_id( $current_blog->blog_id, $current_blog->site_id );

</span><span class="cx" style="display: block; padding: 0 10px"> $table_prefix       = $wpdb->get_blog_prefix();

</span><span class="cx" style="display: block; padding: 0 10px"> $_wp_switched_stack = array();

</span><span class="cx" style="display: block; padding: 0 10px"> $switched           = 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">-// need to init cache again after blog_id is set

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Need to init cache again after blog_id is set.

</ins><span class="cx" style="display: block; padding: 0 10px"> wp_start_object_cache();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $current_site instanceof WP_Network ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -111,7 +111,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $current_blog = new WP_Site( $current_blog );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Define upload directory constants

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Define upload directory constants.

</ins><span class="cx" style="display: block; padding: 0 10px"> ms_upload_constants();

</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="trunksrcwpincludesmssitephp"></a>

<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-site.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-site.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/ms-site.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -761,8 +761,8 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">        // Remove all permissions that may exist for the site.

</span><span class="cx" style="display: block; padding: 0 10px">        $table_prefix = $wpdb->get_blog_prefix();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        delete_metadata( 'user', 0, $table_prefix . 'user_level', null, true ); // delete all

-       delete_metadata( 'user', 0, $table_prefix . 'capabilities', null, true ); // delete all

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ delete_metadata( 'user', 0, $table_prefix . 'user_level', null, true );   // Delete all.

+       delete_metadata( 'user', 0, $table_prefix . 'capabilities', null, true ); // Delete all.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">        // Install default site content.

</span><span class="cx" style="display: block; padding: 0 10px">        wp_install_defaults( $args['user_id'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -863,7 +863,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $index   = 0;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        while ( $index < count( $stack ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Get indexed directory from stack

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Get indexed directory from stack.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $dir = $stack[ $index ];

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                // phpcs:disable WordPress.PHP.NoSilencedErrors.Discouraged

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -889,7 +889,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $index++;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $stack = array_reverse( $stack ); // Last added dirs are deepest

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $stack = array_reverse( $stack ); // Last added directories are deepest.

</ins><span class="cx" style="display: block; padding: 0 10px">         foreach ( (array) $stack as $dir ) {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $dir != $top_dir ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        @rmdir( $dir );

</span></span></pre></div>

<a id="trunksrcwpincludesnavmenutemplatephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/nav-menu-template.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/nav-menu-template.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/nav-menu-template.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,7 +72,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $args = wp_parse_args( $args, $defaults );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! in_array( $args['item_spacing'], array( 'preserve', 'discard' ), true ) ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // invalid value, fall back to default.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Invalid value, fall back to default.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $args['item_spacing'] = $defaults['item_spacing'];

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -113,16 +113,16 @@

</span><span class="cx" style="display: block; padding: 0 10px">                return $nav_menu;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Get the nav menu based on the requested menu

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Get the nav menu based on the requested menu.

</ins><span class="cx" style="display: block; padding: 0 10px">         $menu = wp_get_nav_menu_object( $args->menu );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Get the nav menu based on the theme_location

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Get the nav menu based on the theme_location.

</ins><span class="cx" style="display: block; padding: 0 10px">         $locations = get_nav_menu_locations();

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! $menu && $args->theme_location && $locations && isset( $locations[ $args->theme_location ] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $menu = wp_get_nav_menu_object( $locations[ $args->theme_location ] );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // get the first menu that has items if we still can't find a menu

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Get the first menu that has items if we still can't find a menu.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! $menu && ! $args->theme_location ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $menus = wp_get_nav_menus();

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $menus as $menu_maybe ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -182,7 +182,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Set up the $menu_item variables

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Set up the $menu_item variables.

</ins><span class="cx" style="display: block; padding: 0 10px">         _wp_menu_item_classes_by_context( $menu_items );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $sorted_menu_items        = array();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -194,7 +194,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">-        // Add the menu-item-has-children class where applicable

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Add the menu-item-has-children class where applicable.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( $menu_items_with_children ) {

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $sorted_menu_items as &$menu_item ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( isset( $menu_items_with_children[ $menu_item->ID ] ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -218,7 +218,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $items .= walk_nav_menu_tree( $sorted_menu_items, $args->depth, $args );

</span><span class="cx" style="display: block; padding: 0 10px">        unset( $sorted_menu_items );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Attributes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Attributes.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! empty( $args->menu_id ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $wrap_id = $args->menu_id;

</span><span class="cx" style="display: block; padding: 0 10px">        } else {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -389,13 +389,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $classes[] = 'menu-item-privacy-policy';

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // if the menu item corresponds to a taxonomy term for the currently-queried non-hierarchical post object

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If the menu item corresponds to a taxonomy term for the currently queried non-hierarchical post object.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $wp_query->is_singular && 'taxonomy' == $menu_item->type && in_array( $menu_item->object_id, $possible_object_parents ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $active_parent_object_ids[] = (int) $menu_item->object_id;

</span><span class="cx" style="display: block; padding: 0 10px">                        $active_parent_item_ids[]   = (int) $menu_item->db_id;

</span><span class="cx" style="display: block; padding: 0 10px">                        $active_object              = $queried_object->post_type;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // if the menu item corresponds to the currently-queried post or taxonomy object

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // If the menu item corresponds to the currently queried post or taxonomy object.

</ins><span class="cx" style="display: block; padding: 0 10px">                 } elseif (

</span><span class="cx" style="display: block; padding: 0 10px">                        $menu_item->object_id == $queried_object_id &&

</span><span class="cx" style="display: block; padding: 0 10px">                        (

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -416,7 +416,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( 'post_type' == $menu_item->type && 'page' == $menu_item->object ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Back compat classes for pages to match wp_page_menu()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Back compat classes for pages to match wp_page_menu().

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $classes[] = 'page_item';

</span><span class="cx" style="display: block; padding: 0 10px">                                $classes[] = 'page-item-' . $menu_item->object_id;

</span><span class="cx" style="display: block; padding: 0 10px">                                $classes[] = 'current_page_item';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -426,7 +426,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $active_parent_object_ids[] = (int) $menu_item->post_parent;

</span><span class="cx" style="display: block; padding: 0 10px">                        $active_object              = $menu_item->object;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // if the menu item corresponds to the currently-queried post type archive

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // If the menu item corresponds to the currently queried post type archive.

</ins><span class="cx" style="display: block; padding: 0 10px">                 } elseif (

</span><span class="cx" style="display: block; padding: 0 10px">                        'post_type_archive' == $menu_item->type &&

</span><span class="cx" style="display: block; padding: 0 10px">                        is_post_type_archive( array( $menu_item->object ) )

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -444,11 +444,11 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $active_parent_item_ids[] = (int) $menu_item->menu_item_parent;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // if the menu item corresponds to the currently-requested URL

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // If the menu item corresponds to the currently requested URL.

</ins><span class="cx" style="display: block; padding: 0 10px">                 } elseif ( 'custom' == $menu_item->object && isset( $_SERVER['HTTP_HOST'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $_root_relative_current = untrailingslashit( $_SERVER['REQUEST_URI'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        //if it is the customize page then it will strips the query var off the url before entering the comparison block.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // If it's the customize page then it will strip the query var off the URL before entering the comparison block.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( is_customize_preview() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $_root_relative_current = strtok( untrailingslashit( $_SERVER['REQUEST_URI'] ), '?' );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -480,7 +480,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( in_array( home_url(), array( untrailingslashit( $current_url ), untrailingslashit( $_indexless_current ) ) ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Back compat for home link to match wp_page_menu()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Back compat for home link to match wp_page_menu().

</ins><span class="cx" style="display: block; padding: 0 10px">                                         $classes[] = 'current_page_item';

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px">                                $active_parent_item_ids[]   = (int) $menu_item->menu_item_parent;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -487,7 +487,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                $active_parent_object_ids[] = (int) $menu_item->post_parent;

</span><span class="cx" style="display: block; padding: 0 10px">                                $active_object              = $menu_item->object;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // give front page item current-menu-item class when extra query arguments involved

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Give front page item the 'current-menu-item' class when extra query arguments are involved.

</ins><span class="cx" style="display: block; padding: 0 10px">                         } elseif ( $item_url == $front_page_url && is_front_page() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $classes[] = 'current-menu-item';

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -497,7 +497,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // back-compat with wp_page_menu: add "current_page_parent" to static home page link for any non-page query

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Back-compat with wp_page_menu(): add "current_page_parent" to static home page link for any non-page query.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! empty( $home_page_id ) && 'post_type' == $menu_item->type && empty( $wp_query->is_page ) && $home_page_id == $menu_item->object_id ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $classes[] = 'current_page_parent';

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -508,7 +508,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $active_parent_item_ids   = array_filter( array_unique( $active_parent_item_ids ) );

</span><span class="cx" style="display: block; padding: 0 10px">        $active_parent_object_ids = array_filter( array_unique( $active_parent_object_ids ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // set parent's class

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Set parent's class.

</ins><span class="cx" style="display: block; padding: 0 10px">         foreach ( (array) $menu_items as $key => $parent_item ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $classes                                   = (array) $parent_item->classes;

</span><span class="cx" style="display: block; padding: 0 10px">                $menu_items[ $key ]->current_item_ancestor = false;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -517,7 +517,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                if (

</span><span class="cx" style="display: block; padding: 0 10px">                        isset( $parent_item->type ) &&

</span><span class="cx" style="display: block; padding: 0 10px">                        (

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // ancestral post object

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Ancestral post object.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 (

</span><span class="cx" style="display: block; padding: 0 10px">                                        'post_type' == $parent_item->type &&

</span><span class="cx" style="display: block; padding: 0 10px">                                        ! empty( $queried_object->post_type ) &&

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -526,7 +526,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        $parent_item->object != $queried_object->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">-                                // ancestral term

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Ancestral term.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 (

</span><span class="cx" style="display: block; padding: 0 10px">                                        'taxonomy' == $parent_item->type &&

</span><span class="cx" style="display: block; padding: 0 10px">                                        isset( $possible_taxonomy_ancestors[ $parent_item->object ] ) &&

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -554,7 +554,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( 'post_type' == $parent_item->type && 'page' == $parent_item->object ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Back compat classes for pages to match wp_page_menu()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Back compat classes for pages to match wp_page_menu().

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( in_array( 'current-menu-parent', $classes ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $classes[] = 'current_page_parent';

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span></span></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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/nav-menu.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -324,7 +324,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                'slug'        => null,

</span><span class="cx" style="display: block; padding: 0 10px">        );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // double-check that we're not going to have one menu take the name of another

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Double-check that we're not going to have one menu take the name of another.

</ins><span class="cx" style="display: block; padding: 0 10px">         $_possible_existing = get_term_by( 'name', $menu_data['menu-name'], 'nav_menu' );

</span><span class="cx" style="display: block; padding: 0 10px">        if (

</span><span class="cx" style="display: block; padding: 0 10px">                $_possible_existing &&

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -342,7 +342,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">-        // menu doesn't already exist, so create a new menu

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Menu doesn't already exist, so create a new menu.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! $_menu || is_wp_error( $_menu ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $menu_exists = get_term_by( 'name', $menu_data['menu-name'], 'nav_menu' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -419,7 +419,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $menu_id         = (int) $menu_id;

</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // make sure that we don't convert non-nav_menu_item objects into nav_menu_item objects

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Make sure that we don't convert non-nav_menu_item objects into nav_menu_item objects.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! empty( $menu_item_db_id ) && ! is_nav_menu_item( $menu_item_db_id ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                return new WP_Error( 'update_nav_menu_item_failed', __( 'The given object ID is not that of a menu item.' ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -495,13 +495,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $args['menu-item-title'] = '';

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // hack to get wp to create a post object when too many properties are empty

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Hack to get wp to create a post object when too many properties are empty.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( '' == $args['menu-item-title'] && '' == $args['menu-item-description'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $args['menu-item-description'] = ' ';

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Populate the menu item object

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Populate the menu item object.

</ins><span class="cx" style="display: block; padding: 0 10px">         $post = array(

</span><span class="cx" style="display: block; padding: 0 10px">                'menu_order'   => $args['menu-item-position'],

</span><span class="cx" style="display: block; padding: 0 10px">                'ping_status'  => 0,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -514,7 +514,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $update = 0 != $menu_item_db_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">-        // New menu item. Default is draft status

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // New menu item. Default is draft status.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! $update ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $post['ID']          = 0;

</span><span class="cx" style="display: block; padding: 0 10px">                $post['post_status'] = 'publish' == $args['menu-item-status'] ? 'publish' : 'draft';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -537,8 +537,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                do_action( 'wp_add_nav_menu_item', $menu_id, $menu_item_db_id, $args );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Associate the menu item with the menu term

-       // Only set the menu term if it isn't set to avoid unnecessary wp_get_object_terms()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Associate the menu item with the menu term.

+       // Only set the menu term if it isn't set to avoid unnecessary wp_get_object_terms().

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( $menu_id && ( ! $update || ! is_object_in_term( $menu_item_db_id, 'nav_menu', (int) $menu->term_id ) ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                wp_set_object_terms( $menu_item_db_id, array( $menu->term_id ), 'nav_menu' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -568,7 +568,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                delete_post_meta( $menu_item_db_id, '_menu_item_orphaned' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Update existing menu item. Default is publish status

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Update existing menu item. Default is publish status.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( $update ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $post['ID']          = $menu_item_db_id;

</span><span class="cx" style="display: block; padding: 0 10px">                $post['post_status'] = 'draft' == $args['menu-item-status'] ? 'draft' : 'publish';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -701,7 +701,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $items = array();

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Get all posts and terms at once to prime the caches

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Get all posts and terms at once to prime the caches.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( empty( $fetched[ $menu->term_id ] ) && ! wp_using_ext_object_cache() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $fetched[ $menu->term_id ] = true;

</span><span class="cx" style="display: block; padding: 0 10px">                $posts                     = array();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -748,7 +748,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $items = array_map( 'wp_setup_nav_menu_item', $items );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        if ( ! is_admin() ) { // Remove invalid items only in front end

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! is_admin() ) { // Remove invalid items only on front end.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $items = array_filter( $items, '_is_valid_nav_menu_item' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1245,11 +1245,11 @@

<span class="cx" style="display: block; padding: 0 10px">                                                        // Go back and check the next new menu location.

</span><span class="cx" style="display: block; padding: 0 10px">                                                        continue 3;

</span><span class="cx" style="display: block; padding: 0 10px">                                                }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        } // endforeach ( $slug_group as $slug )

-                               } // endforeach ( $old_nav_menu_locations as $location => $menu_id )

-                       } // endforeach foreach ( $registered_nav_menus as $new_location => $name )

-               } // endforeach ( $slug_group as $slug )

-       } // endforeach ( $common_slug_groups as $slug_group )

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 } // End foreach ( $slug_group as $slug ).

+                               } // End foreach ( $old_nav_menu_locations as $location => $menu_id ).

+                       } // End foreach foreach ( $registered_nav_menus as $new_location => $name ).

+               } // End foreach ( $slug_group as $slug ).

+       } // End foreach ( $common_slug_groups as $slug_group ).

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        return $new_nav_menu_locations;

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span></span></pre></div>

<a id="trunksrcwpincludesoptionphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/option.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/option.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/option.php    2020-01-29 00:43:23 UTC (rev 47122)

</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">        $passed_default = func_num_args() > 1;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! wp_installing() ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // prevent non-existent options from triggering multiple queries

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Prevent non-existent options from triggering multiple queries.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $notoptions = wp_cache_get( 'notoptions', 'options' );

</span><span class="cx" style="display: block; padding: 0 10px">                if ( isset( $notoptions[ $option ] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -99,11 +99,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( false === $value ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $row = $wpdb->get_row( $wpdb->prepare( "SELECT option_value FROM $wpdb->options WHERE option_name = %s LIMIT 1", $option ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Has to be get_row instead of get_var because of funkiness with 0, false, null values

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Has to be get_row() instead of get_var() because of funkiness with 0, false, null values.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( is_object( $row ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        $value = $row->option_value;

</span><span class="cx" style="display: block; padding: 0 10px">                                        wp_cache_add( $option, $value, 'options' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                } else { // option does not exist, so we must cache its non-existence

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         } else { // Option does not exist, so we must cache its non-existence.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         if ( ! is_array( $notoptions ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                $notoptions = array();

</span><span class="cx" style="display: block; padding: 0 10px">                                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -127,7 +127,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // If home is not set use siteurl.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If home is not set, use siteurl.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( 'home' == $option && '' == $value ) {

</span><span class="cx" style="display: block; padding: 0 10px">                return get_option( 'siteurl' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -479,7 +479,8 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $value = sanitize_option( $option, $value );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Make sure the option doesn't already exist. We can check the 'notoptions' cache before we ask for a db query

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Make sure the option doesn't already exist.

+       // We can check the 'notoptions' cache before we ask for a DB query.

</ins><span class="cx" style="display: block; padding: 0 10px">         $notoptions = wp_cache_get( 'notoptions', 'options' );

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! is_array( $notoptions ) || ! isset( $notoptions[ $option ] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                /** This filter is documented in wp-includes/option.php */

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -516,8 +517,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // This option exists now

-       $notoptions = wp_cache_get( 'notoptions', 'options' ); // yes, again... we need it to be fresh

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // This option exists now.

+       $notoptions = wp_cache_get( 'notoptions', 'options' ); // Yes, again... we need it to be fresh.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( is_array( $notoptions ) && isset( $notoptions[ $option ] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                unset( $notoptions[ $option ] );

</span><span class="cx" style="display: block; padding: 0 10px">                wp_cache_set( 'notoptions', $notoptions, 'options' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -568,7 +569,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        wp_protect_special_option( $option );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Get the ID, if no ID then return

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Get the ID, if no ID then return.

</ins><span class="cx" style="display: block; padding: 0 10px">         $row = $wpdb->get_row( $wpdb->prepare( "SELECT autoload FROM $wpdb->options WHERE option_name = %s", $option ) );

</span><span class="cx" style="display: block; padding: 0 10px">        if ( is_null( $row ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                return false;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -707,7 +708,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        } else {

</span><span class="cx" style="display: block; padding: 0 10px">                $transient_option = '_transient_' . $transient;

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! wp_installing() ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // If option is not in alloptions, it is not autoloaded and thus has a timeout

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // If option is not in alloptions, it is not autoloaded and thus has a timeout.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $alloptions = wp_load_alloptions();

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! isset( $alloptions[ $transient_option ] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $transient_timeout = '_transient_timeout_' . $transient;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -881,7 +882,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! is_multisite() ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // non-Multisite stores site transients in the options table.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Single site stores site transients in the options table.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $wpdb->query(

</span><span class="cx" style="display: block; padding: 0 10px">                        $wpdb->prepare(

</span><span class="cx" style="display: block; padding: 0 10px">                                "DELETE a, b FROM {$wpdb->options} a, {$wpdb->options} b

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -940,7 +941,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        if ( isset( $_COOKIE[ 'wp-settings-' . $user_id ] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $cookie = preg_replace( '/[^A-Za-z0-9=&_]/', '', $_COOKIE[ 'wp-settings-' . $user_id ] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // No change or both empty

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // No change or both empty.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $cookie == $settings ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -948,7 +949,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $last_saved = (int) get_user_option( 'user-settings-time', $user_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $current    = isset( $_COOKIE[ 'wp-settings-time-' . $user_id ] ) ? preg_replace( '/[^0-9]/', '', $_COOKIE[ 'wp-settings-time-' . $user_id ] ) : 0;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // The cookie is newer than the saved value. Update the user_option and leave the cookie as-is

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // The cookie is newer than the saved value. Update the user_option and leave the cookie as-is.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $current > $last_saved ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        update_user_option( $user_id, 'user-settings', $cookie, false );

</span><span class="cx" style="display: block; padding: 0 10px">                        update_user_option( $user_id, 'user-settings-time', time() - 5, false );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1063,7 +1064,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        if ( isset( $_COOKIE[ 'wp-settings-' . $user_id ] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $cookie = preg_replace( '/[^A-Za-z0-9=&_-]/', '', $_COOKIE[ 'wp-settings-' . $user_id ] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( strpos( $cookie, '=' ) ) { // '=' cannot be 1st char

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( strpos( $cookie, '=' ) ) { // '=' cannot be 1st char.

</ins><span class="cx" style="display: block; padding: 0 10px">                         parse_str( $cookie, $user_settings );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        } else {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1260,7 +1261,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                return $pre;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // prevent non-existent options from triggering multiple queries

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Prevent non-existent options from triggering multiple queries.

</ins><span class="cx" style="display: block; padding: 0 10px">         $notoptions_key = "$network_id:notoptions";

</span><span class="cx" style="display: block; padding: 0 10px">        $notoptions     = wp_cache_get( $notoptions_key, 'site-options' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1294,7 +1295,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! isset( $value ) || false === $value ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $row = $wpdb->get_row( $wpdb->prepare( "SELECT meta_value FROM $wpdb->sitemeta WHERE meta_key = %s AND site_id = %d", $option, $network_id ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Has to be get_row instead of get_var because of funkiness with 0, false, null values

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Has to be get_row() instead of get_var() because of funkiness with 0, false, null values.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( is_object( $row ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $value = $row->meta_value;

</span><span class="cx" style="display: block; padding: 0 10px">                                $value = maybe_unserialize( $value );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1389,7 +1390,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">        } else {

</span><span class="cx" style="display: block; padding: 0 10px">                $cache_key = "$network_id:$option";

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make sure the option doesn't already exist. We can check the 'notoptions' cache before we ask for a db query

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure the option doesn't already exist.

+               // We can check the 'notoptions' cache before we ask for a DB query.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $notoptions = wp_cache_get( $notoptions_key, 'site-options' );

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! is_array( $notoptions ) || ! isset( $notoptions[ $option ] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( false !== get_network_option( $network_id, $option, false ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1415,8 +1417,8 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                wp_cache_set( $cache_key, $value, 'site-options' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // This option exists now

-               $notoptions = wp_cache_get( $notoptions_key, 'site-options' ); // yes, again... we need it to be fresh

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // This option exists now.

+               $notoptions = wp_cache_get( $notoptions_key, 'site-options' ); // Yes, again... we need it to be fresh.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( is_array( $notoptions ) && isset( $notoptions[ $option ] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        unset( $notoptions[ $option ] );

</span><span class="cx" style="display: block; padding: 0 10px">                        wp_cache_set( $notoptions_key, $notoptions, 'site-options' );

</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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/pluggable.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -168,7 +168,7 @@

<span class="cx" style="display: block; padding: 0 10px">         * @return bool Whether the email contents were sent successfully.

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function wp_mail( $to, $subject, $message, $headers = '', $attachments = array() ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Compact the input, apply the filters, and extract them back out

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Compact the input, apply the filters, and extract them back out.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                /**

<span class="cx" style="display: block; padding: 0 10px">                 * Filters the wp_mail() arguments.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -209,7 +209,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">                global $phpmailer;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // (Re)create it, if it's gone missing

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // (Re)create it, if it's gone missing.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! ( $phpmailer instanceof PHPMailer ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        require_once ABSPATH . WPINC . '/class-phpmailer.php';

</span><span class="cx" style="display: block; padding: 0 10px">                        require_once ABSPATH . WPINC . '/class-smtp.php';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -216,7 +216,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $phpmailer = new PHPMailer( 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">-                // Headers

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Headers.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $cc       = array();

</span><span class="cx" style="display: block; padding: 0 10px">                $bcc      = array();

</span><span class="cx" style="display: block; padding: 0 10px">                $reply_to = array();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -225,8 +225,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $headers = array();

</span><span class="cx" style="display: block; padding: 0 10px">                } else {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! is_array( $headers ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Explode the headers out, so this function can take both

-                               // string headers and an array of headers.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Explode the headers out, so this function can take

+                               // both string headers and an array of headers.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $tempheaders = explode( "\n", str_replace( "\r\n", "\n", $headers ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        } else {

</span><span class="cx" style="display: block; padding: 0 10px">                                $tempheaders = $headers;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -233,9 +233,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                        $headers = array();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // If it's actually got contents

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // If it's actually got contents.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( ! empty( $tempheaders ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Iterate through the raw headers

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Iterate through the raw headers.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 foreach ( (array) $tempheaders as $header ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        if ( strpos( $header, ':' ) === false ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                if ( false !== stripos( $header, 'boundary=' ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -244,15 +244,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                                }

</span><span class="cx" style="display: block; padding: 0 10px">                                                continue;

</span><span class="cx" style="display: block; padding: 0 10px">                                        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Explode them out

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Explode them out.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         list( $name, $content ) = explode( ':', trim( $header ), 2 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Cleanup crew

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Cleanup crew.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         $name    = trim( $name );

</span><span class="cx" style="display: block; padding: 0 10px">                                        $content = trim( $content );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                        switch ( strtolower( $name ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                // Mainly for legacy -- process a From: header if it's there

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         // Mainly for legacy -- process a "From:" header if it's there.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                 case 'from':

</span><span class="cx" style="display: block; padding: 0 10px">                                                        $bracket_pos = strpos( $content, '<' );

</span><span class="cx" style="display: block; padding: 0 10px">                                                        if ( $bracket_pos !== false ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -298,7 +298,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                                        $reply_to = array_merge( (array) $reply_to, explode( ',', $content ) );

</span><span class="cx" style="display: block; padding: 0 10px">                                                        break;

</span><span class="cx" style="display: block; padding: 0 10px">                                                default:

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                        // Add it to our grand headers array

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 // Add it to our grand headers array.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                         $headers[ trim( $name ) ] = trim( $content );

</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">@@ -306,25 +306,26 @@

</span><span class="cx" style="display: 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">-                // Empty out the values that may be set

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Empty out the values that may be set.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $phpmailer->clearAllRecipients();

</span><span class="cx" style="display: block; padding: 0 10px">                $phpmailer->clearAttachments();

</span><span class="cx" style="display: block; padding: 0 10px">                $phpmailer->clearCustomHeaders();

</span><span class="cx" style="display: block; padding: 0 10px">                $phpmailer->clearReplyTos();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // From email and name

-               // If we don't have a name from the input headers

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set "From" name and email.

+

+               // If we don't have a name from the input headers.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! isset( $from_name ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $from_name = 'WordPress';

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                /* If we don't have an email from the input headers default to wordpress@$sitename

-                * Some hosts will block outgoing mail from this address if it doesn't exist but

-                * there's no easy alternative. Defaulting to admin_email might appear to be another

-                * option but some hosts may refuse to relay mail from an unknown domain. See

-                * https://core.trac.wordpress.org/ticket/5007.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /*

+                * If we don't have an email from the input headers, default to wordpress@$sitename

+                * Some hosts will block outgoing mail from this address if it doesn't exist,

+                * but there's no easy alternative. Defaulting to admin_email might appear to be

+                * another option, but some hosts may refuse to relay mail from an unknown domain.

+                * See https://core.trac.wordpress.org/ticket/5007.

</ins><span class="cx" style="display: block; padding: 0 10px">                  */

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-

</del><span class="cx" style="display: block; padding: 0 10px">                 if ( ! isset( $from_email ) ) {

<span class="cx" style="display: block; padding: 0 10px">                        // Get the site domain and get rid of www.

</span><span class="cx" style="display: block; padding: 0 10px">                        $sitename = strtolower( $_SERVER['SERVER_NAME'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -365,11 +366,11 @@

</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">-                // Set mail's subject and body

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set mail's subject and body.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $phpmailer->Subject = $subject;

</span><span class="cx" style="display: block; padding: 0 10px">                $phpmailer->Body    = $message;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set destination addresses, using appropriate methods for handling addresses

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set destination addresses, using appropriate methods for handling addresses.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $address_headers = compact( 'to', 'cc', 'bcc', 'reply_to' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $address_headers as $address_header => $addresses ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -379,7 +380,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        foreach ( (array) $addresses as $address ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                try {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Break $recipient into name and address parts if in the format "Foo <bar@baz.com>"

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Break $recipient into name and address parts if in the format "Foo <bar@baz.com>".

</ins><span class="cx" style="display: block; padding: 0 10px">                                         $recipient_name = '';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                        if ( preg_match( '/(.*)<(.+)>/', $address, $matches ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -409,11 +410,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set to use PHP's mail()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set to use PHP's mail().

</ins><span class="cx" style="display: block; padding: 0 10px">                 $phpmailer->isMail();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set Content-Type and charset

-               // If we don't have a content-type from the input headers

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set Content-Type and charset.

+

+               // If we don't have a content-type from the input headers.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! isset( $content_type ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $content_type = 'text/plain';

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -429,12 +431,12 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $phpmailer->ContentType = $content_type;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set whether it's plaintext, depending on $content_type

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set whether it's plaintext, depending on $content_type.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( 'text/html' == $content_type ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $phpmailer->isHTML( true );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If we don't have a charset from the input headers

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If we don't have a charset from the input headers.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! isset( $charset ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $charset = get_bloginfo( 'charset' );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -537,7 +539,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $user = apply_filters( 'authenticate', null, $username, $password );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $user == null ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // TODO what should the error message be? (Or would these even happen?)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // TODO: What should the error message be? (Or would these even happen?)

</ins><span class="cx" style="display: block; padding: 0 10px">                         // Only needed if all authentication handlers fail to return anything.

</span><span class="cx" style="display: block; padding: 0 10px">                        $user = new WP_Error( 'authentication_failed', __( '<strong>ERROR</strong>: Invalid username, email address or incorrect password.' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -625,12 +627,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $expired    = $cookie_elements['expiration'];

</span><span class="cx" style="display: block; padding: 0 10px">                $expiration = $cookie_elements['expiration'];

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Allow a grace period for POST and Ajax requests

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Allow a grace period for POST and Ajax requests.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( wp_doing_ajax() || 'POST' == $_SERVER['REQUEST_METHOD'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $expired += HOUR_IN_SECONDS;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Quick check to see if an honest cookie has expired

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Quick check to see if an honest cookie has expired.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $expired < time() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        /**

<span class="cx" style="display: block; padding: 0 10px">                         * Fires once an authentication cookie has expired.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -689,7 +691,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">-                // Ajax/POST grace period set above

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Ajax/POST grace period set above.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $expiration < time() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $GLOBALS['login_grace_period'] = 1;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -966,7 +968,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">-                // Auth cookies

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Auth cookies.

</ins><span class="cx" style="display: block; padding: 0 10px">                 setcookie( AUTH_COOKIE, ' ', time() - YEAR_IN_SECONDS, ADMIN_COOKIE_PATH, COOKIE_DOMAIN );

</span><span class="cx" style="display: block; padding: 0 10px">                setcookie( SECURE_AUTH_COOKIE, ' ', time() - YEAR_IN_SECONDS, ADMIN_COOKIE_PATH, COOKIE_DOMAIN );

</span><span class="cx" style="display: block; padding: 0 10px">                setcookie( AUTH_COOKIE, ' ', time() - YEAR_IN_SECONDS, PLUGINS_COOKIE_PATH, COOKIE_DOMAIN );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -974,23 +976,23 @@

</span><span class="cx" style="display: block; padding: 0 10px">                setcookie( LOGGED_IN_COOKIE, ' ', time() - YEAR_IN_SECONDS, COOKIEPATH, COOKIE_DOMAIN );

</span><span class="cx" style="display: block; padding: 0 10px">                setcookie( LOGGED_IN_COOKIE, ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH, COOKIE_DOMAIN );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Settings cookies

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Settings cookies.

</ins><span class="cx" style="display: block; padding: 0 10px">                 setcookie( 'wp-settings-' . get_current_user_id(), ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH );

</span><span class="cx" style="display: block; padding: 0 10px">                setcookie( 'wp-settings-time-' . get_current_user_id(), ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Old cookies

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Old cookies.

</ins><span class="cx" style="display: block; padding: 0 10px">                 setcookie( AUTH_COOKIE, ' ', time() - YEAR_IN_SECONDS, COOKIEPATH, COOKIE_DOMAIN );

</span><span class="cx" style="display: block; padding: 0 10px">                setcookie( AUTH_COOKIE, ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH, COOKIE_DOMAIN );

</span><span class="cx" style="display: block; padding: 0 10px">                setcookie( SECURE_AUTH_COOKIE, ' ', time() - YEAR_IN_SECONDS, COOKIEPATH, COOKIE_DOMAIN );

</span><span class="cx" style="display: block; padding: 0 10px">                setcookie( SECURE_AUTH_COOKIE, ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH, COOKIE_DOMAIN );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Even older cookies

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Even older cookies.

</ins><span class="cx" style="display: block; padding: 0 10px">                 setcookie( USER_COOKIE, ' ', time() - YEAR_IN_SECONDS, COOKIEPATH, COOKIE_DOMAIN );

</span><span class="cx" style="display: block; padding: 0 10px">                setcookie( PASS_COOKIE, ' ', time() - YEAR_IN_SECONDS, COOKIEPATH, COOKIE_DOMAIN );

</span><span class="cx" style="display: block; padding: 0 10px">                setcookie( USER_COOKIE, ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH, COOKIE_DOMAIN );

</span><span class="cx" style="display: block; padding: 0 10px">                setcookie( PASS_COOKIE, ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH, COOKIE_DOMAIN );

</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 password cookie

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Post password cookie.

</ins><span class="cx" style="display: block; padding: 0 10px">                 setcookie( 'wp-postpass_' . COOKIEHASH, ' ', time() - YEAR_IN_SECONDS, COOKIEPATH, COOKIE_DOMAIN );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> endif;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1026,8 +1028,6 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @since 1.5.0

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function auth_redirect() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Checks if a user is logged in, if not redirects them to the login page

-

</del><span class="cx" style="display: block; padding: 0 10px">                 $secure = ( is_ssl() || force_ssl_admin() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1039,7 +1039,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                $secure = apply_filters( 'secure_auth_redirect', $secure );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If https is required and request is http, redirect

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If https is required and request is http, redirect.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $secure && ! is_ssl() && false !== strpos( $_SERVER['REQUEST_URI'], 'wp-admin' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( 0 === strpos( $_SERVER['REQUEST_URI'], 'http' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                wp_redirect( set_url_scheme( $_SERVER['REQUEST_URI'], 'https' ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1081,10 +1081,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return;  // The cookie is good so we're done

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return; // The cookie is good, so we're done.

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // The cookie is no good so force login

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // The cookie is no good, so force login.

</ins><span class="cx" style="display: block; padding: 0 10px">                 nocache_headers();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $redirect = ( strpos( $_SERVER['REQUEST_URI'], '/options.php' ) && wp_get_referer() ) ? wp_get_referer() : set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1262,7 +1262,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $location = wp_sanitize_redirect( $location );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! $is_IIS && PHP_SAPI != 'cgi-fcgi' ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        status_header( $status ); // This causes problems on IIS and some FastCGI setups

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 status_header( $status ); // This causes problems on IIS and some FastCGI setups.

</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">@@ -1373,7 +1373,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function wp_safe_redirect( $location, $status = 302, $x_redirect_by = 'WordPress' ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Need to look at the URL the way it will end up in wp_redirect()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Need to look at the URL the way it will end up in wp_redirect().

</ins><span class="cx" style="display: block; padding: 0 10px">                 $location = wp_sanitize_redirect( $location );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1408,12 +1408,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function wp_validate_redirect( $location, $default = '' ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $location = trim( $location, " \t\n\r\0\x08\x0B" );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // browsers will assume 'http' is your protocol, and will obey a redirect to a URL starting with '//'

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Browsers will assume 'http' is your protocol, and will obey a redirect to a URL starting with '//'.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( substr( $location, 0, 2 ) == '//' ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $location = 'http:' . $location;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // In php 5 parse_url may fail if the URL query part contains http://, bug #38143

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // In PHP 5 parse_url() may fail if the URL query part contains 'http://'.

+               // See https://bugs.php.net/bug.php?id=38143

</ins><span class="cx" style="display: block; padding: 0 10px">                 $cut  = strpos( $location, '?' );

</span><span class="cx" style="display: block; padding: 0 10px">                $test = $cut ? substr( $location, 0, $cut ) : $location;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1420,12 +1421,12 @@

<span class="cx" style="display: block; padding: 0 10px">                // @-operator is used to prevent possible warnings in PHP < 5.3.3.

</span><span class="cx" style="display: block; padding: 0 10px">                $lp = @parse_url( $test );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Give up if malformed URL

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Give up if malformed URL.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( false === $lp ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return $default;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Allow only http and https schemes. No data:, etc.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Allow only 'http' and 'https' schemes. No 'data:', etc.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( isset( $lp['scheme'] ) && ! ( 'http' == $lp['scheme'] || 'https' == $lp['scheme'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return $default;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1439,7 +1440,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $location = '/' . ltrim( $path . '/', '/' ) . $location;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Reject if certain components are set but host is not. This catches urls like https:host.com for which parse_url does not set the host field.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Reject if certain components are set but host is not.

+               // This catches URLs like https:host.com for which parse_url() does not set the host field.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! isset( $lp['host'] ) && ( isset( $lp['scheme'] ) || isset( $lp['user'] ) || isset( $lp['pass'] ) || isset( $lp['port'] ) ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return $default;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1536,22 +1538,22 @@

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                $notify_author = apply_filters( 'comment_notification_notify_author', false, $comment->comment_ID );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // The comment was left by the author

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // The comment was left by the author.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $author && ! $notify_author && $comment->user_id == $post->post_author ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        unset( $emails[ $author->user_email ] );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // The author moderated a comment on their own post

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // The author moderated a comment on their own post.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $author && ! $notify_author && $post->post_author == get_current_user_id() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        unset( $emails[ $author->user_email ] );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // The post author is no longer a member of the blog

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // The post author is no longer a member of the blog.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $author && ! $notify_author && ! user_can( $post->post_author, 'read_post', $post->ID ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        unset( $emails[ $author->user_email ] );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If there's no email to send the comment to, bail, otherwise flip array back around for use below

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If there's no email to send the comment to, bail, otherwise flip array back around for use below.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! count( $emails ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return false;

</span><span class="cx" style="display: block; padding: 0 10px">                } else {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1565,8 +1567,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $comment_author_domain = gethostbyaddr( $comment->comment_author_IP );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // The blogname option is escaped with esc_html on the way into the database in sanitize_option

-               // we want to reverse this for the plain text arena of emails.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // The blogname option is escaped with esc_html() on the way into the database in sanitize_option().

+               // We want to reverse this for the plain text arena of emails.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $blogname        = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );

</span><span class="cx" style="display: block; padding: 0 10px">                $comment_content = wp_specialchars_decode( $comment->comment_content );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1599,7 +1601,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                $subject = sprintf( __( '[%1$s] Pingback: "%2$s"' ), $blogname, $post->post_title );

</span><span class="cx" style="display: block; padding: 0 10px">                                break;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        default: // Comments

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 default: // Comments.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 /* translators: %s: Post title. */

</span><span class="cx" style="display: block; padding: 0 10px">                                $notify_message = sprintf( __( 'New comment on your post "%s"' ), $post->post_title ) . "\r\n";

</span><span class="cx" style="display: block; padding: 0 10px">                                /* translators: 1: Comment author's name, 2: Comment author's IP address, 3: Comment author's hostname. */

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1754,8 +1756,8 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $comments_waiting = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->comments WHERE comment_approved = '0'" );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // The blogname option is escaped with esc_html on the way into the database in sanitize_option

-               // we want to reverse this for the plain text arena of emails.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // The blogname option is escaped with esc_html() on the way into the database in sanitize_option().

+               // We want to reverse this for the plain text arena of emails.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $blogname        = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );

</span><span class="cx" style="display: block; padding: 0 10px">                $comment_content = wp_specialchars_decode( $comment->comment_content );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1782,7 +1784,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                $notify_message .= __( 'Pingback excerpt: ' ) . "\r\n" . $comment_content . "\r\n\r\n";

</span><span class="cx" style="display: block; padding: 0 10px">                                break;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        default: // Comments

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 default: // Comments.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 /* translators: %s: Post title. */

</span><span class="cx" style="display: block; padding: 0 10px">                                $notify_message  = sprintf( __( 'A new comment on the post "%s" is waiting for your approval' ), $post->post_title ) . "\r\n";

</span><span class="cx" style="display: block; padding: 0 10px">                                $notify_message .= get_permalink( $comment->comment_post_ID ) . "\r\n\r\n";

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1893,13 +1895,13 @@

<span class="cx" style="display: block; padding: 0 10px">         * @param WP_User $user User object.

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function wp_password_change_notification( $user ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // send a copy of password change notification to the admin

-               // but check to see if it's the admin whose password we're changing, and skip this

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Send a copy of password change notification to the admin,

+               // but check to see if it's the admin whose password we're changing, and skip this.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( 0 !== strcasecmp( $user->user_email, get_option( 'admin_email' ) ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        /* translators: %s: User name. */

</span><span class="cx" style="display: block; padding: 0 10px">                        $message = sprintf( __( 'Password changed for user: %s' ), $user->user_login ) . "\r\n";

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // The blogname option is escaped with esc_html on the way into the database in sanitize_option

-                       // we want to reverse this for the plain text arena of emails.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // The blogname option is escaped with esc_html() on the way into the database in sanitize_option().

+                       // We want to reverse this for the plain text arena of emails.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $blogname = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $wp_password_change_notification_email = array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1959,7 +1961,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        _deprecated_argument( __FUNCTION__, '4.3.1' );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Accepts only 'user', 'admin' , 'both' or default '' as $notify

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Accepts only 'user', 'admin' , 'both' or default '' as $notify.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! in_array( $notify, array( 'user', 'admin', 'both', '' ), true ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1966,8 +1968,8 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $user = get_userdata( $user_id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // The blogname option is escaped with esc_html on the way into the database in sanitize_option

-               // we want to reverse this for the plain text arena of emails.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // The blogname option is escaped with esc_html() on the way into the database in sanitize_option().

+               // We want to reverse this for the plain text arena of emails.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $blogname = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( 'user' !== $notify ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2018,7 +2020,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"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // `$deprecated was pre-4.3 `$plaintext_pass`. An empty `$plaintext_pass` didn't sent a user notification.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // `$deprecated` was pre-4.3 `$plaintext_pass`. An empty `$plaintext_pass` didn't sent a user notification.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( 'admin' === $notify || ( empty( $deprecated ) && empty( $notify ) ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2138,13 +2140,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $token = wp_get_session_token();

</span><span class="cx" style="display: block; padding: 0 10px">                $i     = wp_nonce_tick();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Nonce generated 0-12 hours ago

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Nonce generated 0-12 hours ago.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $expected = substr( wp_hash( $i . '|' . $action . '|' . $uid . '|' . $token, 'nonce' ), -12, 10 );

</span><span class="cx" style="display: block; padding: 0 10px">                if ( hash_equals( $expected, $nonce ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return 1;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Nonce generated 12-24 hours ago

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Nonce generated 12-24 hours ago.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $expected = substr( wp_hash( ( $i - 1 ) . '|' . $action . '|' . $uid . '|' . $token, 'nonce' ), -12, 10 );

</span><span class="cx" style="display: block; padding: 0 10px">                if ( hash_equals( $expected, $nonce ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return 2;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2162,7 +2164,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                do_action( 'wp_verify_nonce_failed', $nonce, $action, $user, $token );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Invalid nonce

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Invalid nonce.

</ins><span class="cx" style="display: block; padding: 0 10px">                 return false;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> endif;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2336,7 +2338,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( empty( $wp_hasher ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        require_once( ABSPATH . WPINC . '/class-phpass.php' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // By default, use the portable hash from phpass

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // By default, use the portable hash from phpass.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $wp_hasher = new PasswordHash( 8, 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">@@ -2392,11 +2394,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        return apply_filters( 'check_password', $check, $password, $hash, $user_id );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If the stored hash is longer than an MD5, presume the

-               // new style phpass portable hash.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If the stored hash is longer than an MD5,

+               // presume the new style phpass portable hash.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( empty( $wp_hasher ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        require_once( ABSPATH . WPINC . '/class-phpass.php' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // By default, use the portable hash from phpass

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // By default, use the portable hash from phpass.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $wp_hasher = new PasswordHash( 8, 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">@@ -2470,14 +2472,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function wp_rand( $min = 0, $max = 0 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                global $rnd_value;

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Some misconfigured 32bit environments (Entropy PHP, for example) truncate integers larger than PHP_INT_MAX to PHP_INT_MAX rather than overflowing them to floats.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Some misconfigured 32-bit environments (Entropy PHP, for example)

+               // truncate integers larger than PHP_INT_MAX to PHP_INT_MAX rather than overflowing them to floats.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $max_random_number = 3000000000 === 2147483647 ? (float) '4294967295' : 4294967295; // 4294967295 = 0xffffffff

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // We only handle Ints, floats are truncated to their integer value.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // We only handle ints, floats are truncated to their integer value.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $min = (int) $min;

</span><span class="cx" style="display: block; padding: 0 10px">                $max = (int) $max;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Use PHP's CSPRNG, or a compatible method

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Use PHP's CSPRNG, or a compatible method.

</ins><span class="cx" style="display: block; padding: 0 10px">                 static $use_random_int_functionality = true;

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $use_random_int_functionality ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        try {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2498,8 +2501,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Reset $rnd_value after 14 uses

-               // 32(md5) + 40(sha1) + 40(sha1) / 8 = 14 random numbers from $rnd_value

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Reset $rnd_value after 14 uses.

+               // 32 (md5) + 40 (sha1) + 40 (sha1) / 8 = 14 random numbers from $rnd_value.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( strlen( $rnd_value ) < 8 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( defined( 'WP_SETUP_CONFIG' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                static $seed = '';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2515,7 +2518,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">-                // Take the first 8 digits for our value

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Take the first 8 digits for our value.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $value = substr( $rnd_value, 0, 8 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Strip the first eight, leaving the remainder for the next call to wp_rand().

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2523,7 +2526,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $value = abs( hexdec( $value ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Reduce the value to be within the min - max range

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Reduce the value to be within the min - max range.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $max != 0 ) {

</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></pre></div>

<a id="trunksrcwpincludespluginphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/plugin.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/plugin.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/plugin.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -152,19 +152,19 @@

</span><span class="cx" style="display: block; padding: 0 10px">  *

</span><span class="cx" style="display: block; padding: 0 10px">  * Example usage:

</span><span class="cx" style="display: block; padding: 0 10px">  *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *     // The filter callback function

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *     // The filter callback function.

</ins><span class="cx" style="display: block; padding: 0 10px">  *     function example_callback( $string, $arg1, $arg2 ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *         // (maybe) modify $string

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *         // (maybe) modify $string.

</ins><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">  *     add_filter( 'example_filter', 'example_callback', 10, 3 );

</span><span class="cx" style="display: block; padding: 0 10px">  *

</span><span class="cx" style="display: block; padding: 0 10px">  *     /*

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *      * Apply the filters by calling the 'example_callback()' function that's

- *      * hooked onto `example_filter` above.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *      * Apply the filters by calling the 'example_callback()' function

+ *      * that's hooked onto `example_filter` above.

</ins><span class="cx" style="display: block; padding: 0 10px">  *      *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *      * - 'example_filter' is the filter hook

- *      * - 'filter me' is the value being filtered

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *      * - 'example_filter' is the filter hook.

+ *      * - 'filter me' is the value being filtered.

</ins><span class="cx" style="display: block; padding: 0 10px">  *      * - $arg1 and $arg2 are the additional arguments passed to the callback.

</span><span class="cx" style="display: block; padding: 0 10px">  *     $value = apply_filters( 'example_filter', 'filter me', $arg1, $arg2 );

</span><span class="cx" style="display: block; padding: 0 10px">  *

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -228,7 +228,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> function apply_filters_ref_array( $tag, $args ) {

</span><span class="cx" style="display: block; padding: 0 10px">        global $wp_filter, $wp_current_filter;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Do 'all' actions first

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Do 'all' actions first.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( isset( $wp_filter['all'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_current_filter[] = $tag;

</span><span class="cx" style="display: block; padding: 0 10px">                $all_args            = func_get_args();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -415,17 +415,17 @@

</span><span class="cx" style="display: block; padding: 0 10px">  *

</span><span class="cx" style="display: block; padding: 0 10px">  * Example usage:

</span><span class="cx" style="display: block; padding: 0 10px">  *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *     // The action callback function

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *     // The action callback function.

</ins><span class="cx" style="display: block; padding: 0 10px">  *     function example_callback( $arg1, $arg2 ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *         // (maybe) do something with the args

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *         // (maybe) do something with the args.

</ins><span class="cx" style="display: block; padding: 0 10px">  *     }

</span><span class="cx" style="display: block; padding: 0 10px">  *     add_action( 'example_action', 'example_callback', 10, 2 );

</span><span class="cx" style="display: block; padding: 0 10px">  *

</span><span class="cx" style="display: block; padding: 0 10px">  *     /*

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *      * Trigger the actions by calling the 'example_callback()' function that's

- *      * hooked onto `example_action` above.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *      * Trigger the actions by calling the 'example_callback()' function

+ *      * that's hooked onto `example_action` above.

</ins><span class="cx" style="display: block; padding: 0 10px">  *      *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *      * - 'example_action' is the action hook

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *      * - 'example_action' is the action hook.

</ins><span class="cx" style="display: block; padding: 0 10px">  *      * - $arg1 and $arg2 are the additional arguments passed to the callback.

</span><span class="cx" style="display: block; padding: 0 10px">  *     $value = do_action( 'example_action', $arg1, $arg2 );

</span><span class="cx" style="display: block; padding: 0 10px">  *

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -450,7 +450,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                ++$wp_actions[ $tag ];

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Do 'all' actions first

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Do 'all' actions first.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( isset( $wp_filter['all'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_current_filter[] = $tag;

</span><span class="cx" style="display: block; padding: 0 10px">                $all_args            = func_get_args();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -523,7 +523,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                ++$wp_actions[ $tag ];

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Do 'all' actions first

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Do 'all' actions first.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( isset( $wp_filter['all'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_current_filter[] = $tag;

</span><span class="cx" style="display: block; padding: 0 10px">                $all_args            = func_get_args();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -692,7 +692,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $plugin_dir    = wp_normalize_path( WP_PLUGIN_DIR );

</span><span class="cx" style="display: block; padding: 0 10px">        $mu_plugin_dir = wp_normalize_path( WPMU_PLUGIN_DIR );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $file = preg_replace( '#^' . preg_quote( $plugin_dir, '#' ) . '/|^' . preg_quote( $mu_plugin_dir, '#' ) . '/#', '', $file ); // get relative path from plugins dir

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Get relative path from plugins directory.

+       $file = preg_replace( '#^' . preg_quote( $plugin_dir, '#' ) . '/|^' . preg_quote( $mu_plugin_dir, '#' ) . '/#', '', $file );

</ins><span class="cx" style="display: block; padding: 0 10px">         $file = trim( $file, '/' );

</span><span class="cx" style="display: block; padding: 0 10px">        return $file;

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -717,7 +718,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> function wp_register_plugin_realpath( $file ) {

</span><span class="cx" style="display: block; padding: 0 10px">        global $wp_plugin_paths;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Normalize, but store as static to avoid recalculation of a constant value

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Normalize, but store as static to avoid recalculation of a constant value.

</ins><span class="cx" style="display: block; padding: 0 10px">         static $wp_plugin_path = null, $wpmu_plugin_path = null;

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! isset( $wp_plugin_path ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_plugin_path   = wp_normalize_path( WP_PLUGIN_DIR );

</span></span></pre></div>

<a id="trunksrcwpincludespomoentryphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/pomo/entry.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/pomo/entry.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/pomo/entry.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,11 +41,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                 *  - flags (array) -- flags like php-format

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                function __construct( $args = array() ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // if no singular -- empty object

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // If no singular -- empty object.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( ! isset( $args['singular'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                return;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // get member variable values from args hash

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Get member variable values from args hash.

</ins><span class="cx" style="display: block; padding: 0 10px">                         foreach ( $args as $varname => $value ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->$varname = $value;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -85,9 +85,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                return false;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Prepend context and EOT, like in MO files

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Prepend context and EOT, like in MO files.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $key = ! $this->context ? $this->singular : $this->context . "\4" . $this->singular;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Standardize on \n line endings

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Standardize on \n line endings.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $key = str_replace( array( "\r\n", "\r" ), "\n", $key );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        return $key;

</span></span></pre></div>

<a id="trunksrcwpincludespomomophp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/pomo/mo.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/pomo/mo.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/pomo/mo.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -101,7 +101,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        ksort( $entries );

</span><span class="cx" style="display: block; padding: 0 10px">                        $magic                     = 0x950412de;

</span><span class="cx" style="display: block; padding: 0 10px">                        $revision                  = 0;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $total                     = count( $entries ) + 1; // all the headers are one entry

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $total                     = count( $entries ) + 1; // All the headers are one entry.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $originals_lenghts_addr    = 28;

</span><span class="cx" style="display: block; padding: 0 10px">                        $translations_lenghts_addr = $originals_lenghts_addr + 8 * $total;

</span><span class="cx" style="display: block; padding: 0 10px">                        $size_of_hash              = 0;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -122,7 +122,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        );

</span><span class="cx" style="display: block; padding: 0 10px">                        fseek( $fh, $originals_lenghts_addr );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // headers' msgid is an empty string

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Headers' msgid is an empty string.

</ins><span class="cx" style="display: block; padding: 0 10px">                         fwrite( $fh, pack( 'VV', 0, $current_addr ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $current_addr++;

</span><span class="cx" style="display: block; padding: 0 10px">                        $originals_table = "\0";

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -133,7 +133,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                $originals_table .= $this->export_original( $entry ) . "\0";

</span><span class="cx" style="display: block; padding: 0 10px">                                $length           = $reader->strlen( $this->export_original( $entry ) );

</span><span class="cx" style="display: block; padding: 0 10px">                                fwrite( $fh, pack( 'VV', $length, $current_addr ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $current_addr += $length + 1; // account for the NULL byte after

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $current_addr += $length + 1; // Account for the NULL byte after.

</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">                        $exported_headers = $this->export_headers();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -158,7 +158,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                 * @return string

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                function export_original( $entry ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        //TODO: warnings for control characters

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // TODO: Warnings for control characters.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $exported = $entry->singular;

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( $entry->is_plural ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $exported .= "\0" . $entry->plural;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -174,7 +174,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                 * @return string

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                function export_translations( $entry ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        //TODO: warnings for control characters

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // TODO: Warnings for control characters.

</ins><span class="cx" style="display: block; padding: 0 10px">                         return $entry->is_plural ? implode( "\0", $entry->translations ) : $entry->translations[0];

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -194,7 +194,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                 * @return string|false

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                function get_byteorder( $magic ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // The magic is 0x950412de

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // The magic is 0x950412de.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        // bug in PHP 5.0.2, see https://savannah.nongnu.org/bugs/?func=detailitem&item_id=10565

</span><span class="cx" style="display: block; padding: 0 10px">                        $magic_little    = (int) - 1794895138;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -228,21 +228,21 @@

</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">-                        // parse header

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Parse header.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $header = unpack( "{$endian}revision/{$endian}total/{$endian}originals_lenghts_addr/{$endian}translations_lenghts_addr/{$endian}hash_length/{$endian}hash_addr", $header );

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! is_array( $header ) ) {

</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">-                        // support revision 0 of MO format specs, only

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Support revision 0 of MO format specs, only.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( $header['revision'] != 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="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // seek to data blocks

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Seek to data blocks.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $reader->seekto( $header['originals_lenghts_addr'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // read originals' indices

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Read originals' indices.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $originals_lengths_length = $header['translations_lenghts_addr'] - $header['originals_lenghts_addr'];

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( $originals_lengths_length != $header['total'] * 8 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                return false;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -253,7 +253,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                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">-                        // read translations' indices

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Read translations' indices.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $translations_lenghts_length = $header['hash_addr'] - $header['translations_lenghts_addr'];

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( $translations_lenghts_length != $header['total'] * 8 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                return false;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -264,11 +264,11 @@

</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">-                        // transform raw data into set of indices

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Transform raw data into set of indices.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $originals    = $reader->str_split( $originals, 8 );

</span><span class="cx" style="display: block; padding: 0 10px">                        $translations = $reader->str_split( $translations, 8 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // skip hash table

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Skip hash table.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $strings_addr = $header['hash_addr'] + $header['hash_length'] * 4;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $reader->seekto( $strings_addr );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -283,7 +283,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">-                                // adjust offset due to reading strings to separate space before

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Adjust offset due to reading strings to separate space before.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $o['pos'] -= $strings_addr;

</span><span class="cx" style="display: block; padding: 0 10px">                                $t['pos'] -= $strings_addr;

</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">                                $original       = $parts[1];

</span><span class="cx" style="display: block; padding: 0 10px">                                $entry->context = $parts[0];

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // look for plural original

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Look for plural original.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $parts           = explode( "\0", $original );

</span><span class="cx" style="display: block; padding: 0 10px">                        $entry->singular = $parts[0];

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( isset( $parts[1] ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -326,7 +326,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                $entry->is_plural = true;

</span><span class="cx" style="display: block; padding: 0 10px">                                $entry->plural    = $parts[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">-                        // plural translations are also separated by \0

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Plural translations are also separated by \0.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $entry->translations = explode( "\0", $translation );

</span><span class="cx" style="display: block; padding: 0 10px">                        return $entry;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span></span></pre></div>

<a id="trunksrcwpincludespomopluralformsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/pomo/plural-forms.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/pomo/plural-forms.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/pomo/plural-forms.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -103,19 +103,19 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $next = substr( $str, $pos, 1 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        switch ( $next ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Ignore whitespace

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Ignore whitespace.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 case ' ':

</span><span class="cx" style="display: block; padding: 0 10px">                                case "\t":

</span><span class="cx" style="display: block; padding: 0 10px">                                        $pos++;

</span><span class="cx" style="display: block; padding: 0 10px">                                        break;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Variable (n)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Variable (n).

</ins><span class="cx" style="display: block; padding: 0 10px">                                 case 'n':

</span><span class="cx" style="display: block; padding: 0 10px">                                        $output[] = array( 'var' );

</span><span class="cx" style="display: block; padding: 0 10px">                                        $pos++;

</span><span class="cx" style="display: block; padding: 0 10px">                                        break;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Parentheses

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Parentheses.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 case '(':

</span><span class="cx" style="display: block; padding: 0 10px">                                        $stack[] = $next;

</span><span class="cx" style="display: block; padding: 0 10px">                                        $pos++;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -143,7 +143,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        $pos++;

</span><span class="cx" style="display: block; padding: 0 10px">                                        break;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Operators

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Operators.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 case '|':

</span><span class="cx" style="display: block; padding: 0 10px">                                case '&':

</span><span class="cx" style="display: block; padding: 0 10px">                                case '>':

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -161,7 +161,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        while ( ! empty( $stack ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                $o2 = $stack[ count( $stack ) - 1 ];

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                // Ternary is right-associative in C

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         // Ternary is right-associative in C.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                 if ( $operator === '?:' || $operator === '?' ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                        if ( self::$op_precedence[ $operator ] >= self::$op_precedence[ $o2 ] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                                break;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -177,7 +177,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        $pos += $end_operator;

</span><span class="cx" style="display: block; padding: 0 10px">                                        break;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Ternary "else"

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Ternary "else".

</ins><span class="cx" style="display: block; padding: 0 10px">                                 case ':':

</span><span class="cx" style="display: block; padding: 0 10px">                                        $found = false;

</span><span class="cx" style="display: block; padding: 0 10px">                                        $s_pos = count( $stack ) - 1;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -201,7 +201,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        $pos++;

</span><span class="cx" style="display: block; padding: 0 10px">                                        break;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Default - number or invalid

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Default - number or invalid.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 default:

</span><span class="cx" style="display: block; padding: 0 10px">                                        if ( $next >= '0' && $next <= '9' ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                $span     = strspn( $str, self::NUM_CHARS, $pos );

</span></span></pre></div>

<a id="trunksrcwpincludespomopophp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/pomo/po.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/pomo/po.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/pomo/po.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,7 +48,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                 * @return string sequence of mgsgid/msgstr PO strings, doesn't containt newline at the end

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                function export_entries() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        //TODO sorting

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // TODO: Sorting.

</ins><span class="cx" style="display: block; padding: 0 10px">                         return implode( "\n\n", array_map( array( 'PO', 'export_entry' ), $this->entries ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -117,12 +117,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $string = str_replace( array_keys( $replaces ), array_values( $replaces ), $string );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $po = $quote . implode( "${slash}n$quote$newline$quote", explode( $newline, $string ) ) . $quote;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // add empty string on first line for readbility

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Add empty string on first line for readbility.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( false !== strpos( $string, $newline ) &&

</span><span class="cx" style="display: block; padding: 0 10px">                                ( substr_count( $string, $newline ) > 1 || ! ( $newline === substr( $string, -strlen( $newline ) ) ) ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $po = "$quote$quote$newline$po";

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // remove empty strings

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Remove empty strings.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $po = str_replace( "$newline$quote$quote", '', $po );

</span><span class="cx" style="display: block; padding: 0 10px">                        return $po;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -161,7 +161,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Standardise the line endings on imported content, technically PO files shouldn't contain \r

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Standardise the line endings on imported content, technically PO files shouldn't contain \r.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $unpoified = str_replace( array( "\r\n", "\r" ), "\n", $unpoified );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        return $unpoified;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -178,9 +178,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $lines  = explode( "\n", $string );

</span><span class="cx" style="display: block; padding: 0 10px">                        $append = '';

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( "\n" === substr( $string, -1 ) && '' === end( $lines ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Last line might be empty because $string was terminated

-                               // with a newline, remove it from the $lines array,

-                               // we'll restore state by re-terminating the string at the end

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         /*

+                                * Last line might be empty because $string was terminated

+                                * with a newline, remove it from the $lines array,

+                                * we'll restore state by re-terminating the string at the end.

+                                */

</ins><span class="cx" style="display: block; padding: 0 10px">                                 array_pop( $lines );

</span><span class="cx" style="display: block; padding: 0 10px">                                $append = "\n";

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -325,8 +327,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                function read_entry( $f, $lineno = 0 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $entry = new Translation_Entry();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // where were we in the last step

-                       // can be: comment, msgctxt, msgid, msgid_plural, msgstr, msgstr_plural

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Where were we in the last step.

+                       // Can be: comment, msgctxt, msgid, msgid_plural, msgstr, msgstr_plural.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $context      = '';

</span><span class="cx" style="display: block; padding: 0 10px">                        $msgstr_index = 0;

</span><span class="cx" style="display: block; padding: 0 10px">                        while ( true ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -336,7 +338,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        if ( feof( $f ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                if ( self::is_final( $context ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                        break;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                } elseif ( ! $context ) { // we haven't read a line and eof came

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         } elseif ( ! $context ) { // We haven't read a line and EOF came.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                         return null;

</span><span class="cx" style="display: block; padding: 0 10px">                                                } else {

</span><span class="cx" style="display: block; padding: 0 10px">                                                        return false;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -350,17 +352,17 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px">                                $line = trim( $line );

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( preg_match( '/^#/', $line, $m ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // the comment is the start of a new entry

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // The comment is the start of a new entry.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         if ( self::is_final( $context ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                PO::read_line( $f, 'put-back' );

</span><span class="cx" style="display: block; padding: 0 10px">                                                $lineno--;

</span><span class="cx" style="display: block; padding: 0 10px">                                                break;

</span><span class="cx" style="display: block; padding: 0 10px">                                        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // comments have to be at the beginning

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Comments have to be at the beginning.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         if ( $context && $context != 'comment' ) {

</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">-                                        // add comment

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Add comment.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         $this->add_comment_to_entry( $entry, $line );

</span><span class="cx" style="display: block; padding: 0 10px">                                } elseif ( preg_match( '/^msgctxt\s+(".*")/', $line, $m ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        if ( self::is_final( $context ) ) {

</span></span></pre></div>

<a id="trunksrcwpincludespomotranslationsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/pomo/translations.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/pomo/translations.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/pomo/translations.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -268,7 +268,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                function make_headers( $translation ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $headers = array();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // sometimes \ns are used instead of real new lines

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Sometimes \n's are used instead of real new lines.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $translation = str_replace( '\n', "\n", $translation );

</span><span class="cx" style="display: block; padding: 0 10px">                        $lines       = explode( "\n", $translation );

</span><span class="cx" style="display: block; padding: 0 10px">                        foreach ( $lines as $line ) {

</span></span></pre></div>

<a id="trunksrcwpincludespostformatsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/post-formats.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/post-formats.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/post-formats.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,7 +94,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function get_post_format_strings() {

</span><span class="cx" style="display: block; padding: 0 10px">        $strings = array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                'standard' => _x( 'Standard', 'Post format' ), // Special case. any value that evals to false will be considered standard

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         'standard' => _x( 'Standard', 'Post format' ), // Special case. Any value that evals to false will be considered standard.

</ins><span class="cx" style="display: block; padding: 0 10px">                 'aside'    => _x( 'Aside', 'Post format' ),

</span><span class="cx" style="display: block; padding: 0 10px">                'chat'     => _x( 'Chat', 'Post format' ),

</span><span class="cx" style="display: block; padding: 0 10px">                'gallery'  => _x( 'Gallery', 'Post format' ),

</span></span></pre></div>

<a id="trunksrcwpincludesposttemplatephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/post-template.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/post-template.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/post-template.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -313,8 +313,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                return get_the_password_form( $_post );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        if ( $elements['page'] > count( $elements['pages'] ) ) { // if the requested page doesn't exist

-               $elements['page'] = count( $elements['pages'] ); // give them the highest numbered page that DOES exist

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If the requested page doesn't exist.

+       if ( $elements['page'] > count( $elements['pages'] ) ) {

+               // Give them the highest numbered page that DOES exist.

+               $elements['page'] = count( $elements['pages'] );

</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_no = $elements['page'];

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -451,7 +453,7 @@

<span class="cx" style="display: block; padding: 0 10px">  * @param int|WP_Post  $post_id Optional. Post ID or post object. Defaults to the global `$post`.

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function post_class( $class = '', $post_id = null ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Separates classes with a single space, collates classes for post DIV

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Separates classes with a single space, collates classes for post DIV.

</ins><span class="cx" style="display: block; padding: 0 10px">         echo 'class="' . join( ' ', get_post_class( $class, $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">@@ -502,7 +504,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $classes[] = 'type-' . $post->post_type;

</span><span class="cx" style="display: block; padding: 0 10px">        $classes[] = 'status-' . $post->post_status;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Post Format

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Post Format.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( post_type_supports( $post->post_type, 'post-formats' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $post_format = get_post_format( $post->ID );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -527,7 +529,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $classes[] = 'has-post-thumbnail';

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // sticky for Sticky Posts

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Sticky for Sticky Posts.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( is_sticky( $post->ID ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( is_home() && ! is_paged() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $classes[] = 'sticky';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -536,10 +538,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // hentry for hAtom compliance

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // hentry for hAtom compliance.

</ins><span class="cx" style="display: block; padding: 0 10px">         $classes[] = 'hentry';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // All public taxonomies

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // All public taxonomies.

</ins><span class="cx" style="display: block; padding: 0 10px">         $taxonomies = get_taxonomies( array( 'public' => true ) );

</span><span class="cx" style="display: block; padding: 0 10px">        foreach ( (array) $taxonomies as $taxonomy ) {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( is_object_in_taxonomy( $post->post_type, $taxonomy ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -587,7 +589,7 @@

<span class="cx" style="display: block; padding: 0 10px">  * @param string|string[] $class Space-separated string or array of class names to add to the class list.

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function body_class( $class = '' ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Separates class names with a single space, collates class names for body element

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Separates class names with a single space, collates class names for body element.

</ins><span class="cx" style="display: block; padding: 0 10px">         echo 'class="' . join( ' ', get_body_class( $class ) ) . '"';

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -664,7 +666,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                $classes[] = 'single-' . sanitize_html_class( $post->post_type, $post_id );

</span><span class="cx" style="display: block; padding: 0 10px">                                $classes[] = 'postid-' . $post_id;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Post Format

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Post Format.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( post_type_supports( $post->post_type, 'post-formats' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        $post_format = get_post_format( $post->ID );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -878,7 +880,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">-// Page Template Functions for usage in Themes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Page Template Functions for usage in Themes.

</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">@@ -1123,7 +1125,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">-// Pages

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Pages.

</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">@@ -1175,7 +1177,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $pages  = get_pages( $parsed_args );

</span><span class="cx" style="display: block; padding: 0 10px">        $output = '';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Back-compat with old system where both id and name were based on $name argument

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Back-compat with old system where both id and name were based on $name argument.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( empty( $parsed_args['id'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $parsed_args['id'] = $parsed_args['name'];

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1276,7 +1278,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $parsed_args = wp_parse_args( $args, $defaults );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! in_array( $parsed_args['item_spacing'], array( 'preserve', 'discard' ), true ) ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // invalid value, fall back to default.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Invalid value, fall back to default.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $parsed_args['item_spacing'] = $defaults['item_spacing'];

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1283,10 +1285,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $output       = '';

</span><span class="cx" style="display: block; padding: 0 10px">        $current_page = 0;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // sanitize, mostly to keep spaces out

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Sanitize, mostly to keep spaces out.

</ins><span class="cx" style="display: block; padding: 0 10px">         $parsed_args['exclude'] = preg_replace( '/[^0-9,]/', '', $parsed_args['exclude'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Allow plugins to filter an array of excluded pages (but don't put a nullstring into the array)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Allow plugins to filter an array of excluded pages (but don't put a nullstring into the array).

</ins><span class="cx" style="display: block; padding: 0 10px">         $exclude_array = ( $parsed_args['exclude'] ) ? explode( ',', $parsed_args['exclude'] ) : array();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1394,7 +1396,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $args     = wp_parse_args( $args, $defaults );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! in_array( $args['item_spacing'], array( 'preserve', 'discard' ) ) ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // invalid value, fall back to default.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Invalid value, fall back to default.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $args['item_spacing'] = $defaults['item_spacing'];

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1421,7 +1423,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $list_args = $args;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Show Home in the menu

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Show Home in the menu.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! empty( $args['show_home'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( true === $args['show_home'] || '1' === $args['show_home'] || 1 === $args['show_home'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $text = __( 'Home' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1433,7 +1435,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $class = 'class="current_page_item"';

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">                $menu .= '<li ' . $class . '><a href="' . home_url( '/' ) . '">' . $args['link_before'] . $text . $args['link_after'] . '</a></li>';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If the front page is a page, add it to the exclude list

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If the front page is a page, add it to the exclude list.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( get_option( 'show_on_front' ) == 'page' ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! empty( $list_args['exclude'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $list_args['exclude'] .= ',';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1457,7 +1459,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( $menu ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // wp_nav_menu doesn't set before and after

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // wp_nav_menu() doesn't set before and after.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( isset( $args['fallback_cb'] ) &&

</span><span class="cx" style="display: block; padding: 0 10px">                        'wp_page_menu' === $args['fallback_cb'] &&

</span><span class="cx" style="display: block; padding: 0 10px">                        'ul' !== $container ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1499,7 +1501,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">-// Page helpers

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Page helpers.

</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">@@ -1543,7 +1545,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"> function walk_page_dropdown_tree( ...$args ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        if ( empty( $args[2]['walker'] ) ) { // the user's options are the third parameter

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $args[2]['walker'] ) ) { // The user's options are the third parameter.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $walker = new Walker_PageDropdown;

</span><span class="cx" style="display: block; padding: 0 10px">        } else {

</span><span class="cx" style="display: block; padding: 0 10px">                $walker = $args[2]['walker'];

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1553,7 +1555,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">-// Attachments

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Attachments.

</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">@@ -1671,7 +1673,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $p = wp_audio_shortcode( array( 'src' => wp_get_attachment_url() ) );

</span><span class="cx" style="display: block; padding: 0 10px">        } else {

</span><span class="cx" style="display: block; padding: 0 10px">                $p = '<p class="attachment">';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // show the medium sized image representation of the attachment if available, and link to the raw file

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Show the medium sized image representation of the attachment if available, and link to the raw file.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $p .= wp_get_attachment_link( 0, 'medium', false );

</span><span class="cx" style="display: block; padding: 0 10px">                $p .= '</p>';

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1691,7 +1693,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">-// Misc

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Misc.

</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">@@ -1916,7 +1918,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">-        // $args array with (parent, format, right, left, type) deprecated since 3.6

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // $args array with (parent, format, right, left, type) deprecated since 3.6.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( is_array( $type ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $type = ! empty( $type['type'] ) ? $type['type'] : $type;

</span><span class="cx" style="display: block; padding: 0 10px">                _deprecated_argument( __FUNCTION__, '3.6.0' );

</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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/post.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,7 +7,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> 

</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 Registration

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Post Type registration.

</ins><span class="cx" style="display: block; padding: 0 10px"> //

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -715,7 +715,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"> function get_extended( $post ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        //Match the new style more links.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Match the new style more links.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( preg_match( '/<!--more(.*?)?-->/', $post, $matches ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                list($main, $extended) = explode( $matches[0], $post, 2 );

</span><span class="cx" style="display: block; padding: 0 10px">                $more_text             = $matches[1];

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -725,7 +725,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $more_text = '';

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        //  leading and trailing whitespace.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Leading and trailing whitespace.

</ins><span class="cx" style="display: block; padding: 0 10px">         $main      = preg_replace( '/^[\s]*(.*)[\s]*$/', '\\1', $main );

</span><span class="cx" style="display: block; padding: 0 10px">        $extended  = preg_replace( '/^[\s]*(.*)[\s]*$/', '\\1', $extended );

</span><span class="cx" style="display: block; padding: 0 10px">        $more_text = preg_replace( '/^[\s]*(.*)[\s]*$/', '\\1', $more_text );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1416,7 +1416,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_post_types = array();

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Sanitize post type name

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Sanitize post type name.

</ins><span class="cx" style="display: block; padding: 0 10px">         $post_type = sanitize_key( $post_type );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( empty( $post_type ) || strlen( $post_type ) > 20 ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1558,7 +1558,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        list( $singular_base, $plural_base ) = $args->capability_type;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $default_capabilities = array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Meta capabilities

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Meta capabilities.

</ins><span class="cx" style="display: block; padding: 0 10px">                 'edit_post'          => 'edit_' . $singular_base,

</span><span class="cx" style="display: block; padding: 0 10px">                'read_post'          => 'read_' . $singular_base,

</span><span class="cx" style="display: block; padding: 0 10px">                'delete_post'        => 'delete_' . $singular_base,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2033,7 +2033,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! empty( $parsed_args['include'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $incposts                      = wp_parse_id_list( $parsed_args['include'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $parsed_args['posts_per_page'] = count( $incposts );  // only the number of posts included

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $parsed_args['posts_per_page'] = count( $incposts );  // Only the number of posts included.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $parsed_args['post__in']       = $incposts;

</span><span class="cx" style="display: block; padding: 0 10px">        } elseif ( ! empty( $parsed_args['exclude'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $parsed_args['post__not_in'] = wp_parse_id_list( $parsed_args['exclude'] );

</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"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</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 meta functions

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Post meta functions.

</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">@@ -2713,7 +2713,7 @@

<span class="cx" style="display: block; padding: 0 10px">  * @return array List of post mime types.

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function get_post_mime_types() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $post_mime_types = array(   //  array( adj, noun )

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_mime_types = array(   // array( adj, noun )

</ins><span class="cx" style="display: block; padding: 0 10px">                 'image'       => array(

</span><span class="cx" style="display: block; padding: 0 10px">                        __( 'Images' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        __( 'Manage Images' ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4274,7 +4274,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">        // Uh oh, someone jumped the gun!

</span><span class="cx" style="display: block; padding: 0 10px">        if ( $time > time() ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                wp_clear_scheduled_hook( 'publish_future_post', array( $post_id ) ); // clear anything else in the system

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         wp_clear_scheduled_hook( 'publish_future_post', array( $post_id ) ); // Clear anything else in the system.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_schedule_single_event( $time, 'publish_future_post', array( $post_id ) );

</span><span class="cx" style="display: block; padding: 0 10px">                return;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4832,7 +4832,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">-// Page functions

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Page functions.

</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">@@ -5266,7 +5266,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $inclusions = '';

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! empty( $parsed_args['include'] ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $child_of     = 0; //ignore child_of, parent, exclude, meta_key, and meta_value params if using include

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $child_of     = 0; // Ignore child_of, parent, exclude, meta_key, and meta_value params if using include.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $parent       = -1;

</span><span class="cx" style="display: block; padding: 0 10px">                $exclude      = '';

</span><span class="cx" style="display: block; padding: 0 10px">                $meta_key     = '';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5292,7 +5292,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</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 ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                //Do we have an author id or an author login?

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Do we have an author id or an author login?

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( 0 == intval( $post_author ) ) {

</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -5321,7 +5321,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        if ( '' !== $meta_key || '' !== $meta_value ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $join = " LEFT JOIN $wpdb->postmeta ON ( $wpdb->posts.ID = $wpdb->postmeta.post_id )";

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // meta_key and meta_value might be slashed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // meta_key and meta_value might be slashed.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $meta_key   = wp_unslash( $meta_key );

</span><span class="cx" style="display: block; padding: 0 10px">                $meta_value = wp_unslash( $meta_value );

</span><span class="cx" style="display: block; padding: 0 10px">                if ( '' !== $meta_key ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5461,7 +5461,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        wp_cache_set( $cache_key, $page_structure, 'posts' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Convert to WP_Post instances

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Convert to WP_Post instances.

</ins><span class="cx" style="display: block; padding: 0 10px">         $pages = array_map( 'get_post', $pages );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5476,7 +5476,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">-// Attachment functions

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Attachment functions.

</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">@@ -5833,7 +5833,7 @@

<span class="cx" style="display: block; padding: 0 10px">                                // Replace file location with url location.

</span><span class="cx" style="display: block; padding: 0 10px">                                $url = str_replace( $uploads['basedir'], $uploads['baseurl'], $file );

</span><span class="cx" style="display: block; padding: 0 10px">                        } elseif ( false !== strpos( $file, 'wp-content/uploads' ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Get the directory name relative to the basedir (back compat for pre-2.7 uploads)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Get the directory name relative to the basedir (back compat for pre-2.7 uploads).

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $url = trailingslashit( $uploads['baseurl'] . '/' . _wp_get_attachment_relative_path( $file ) ) . wp_basename( $file );

</span><span class="cx" style="display: block; padding: 0 10px">                        } else {

<span class="cx" style="display: block; padding: 0 10px">                                // It's a newly-uploaded file, therefore $file is relative to the basedir.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6353,8 +6353,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        $post_status_sql .= " OR post_status = 'private' AND post_author = $id";

</span><span class="cx" style="display: block; padding: 0 10px">                                } elseif ( $id == (int) $post_author ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        $post_status_sql .= " OR post_status = 'private'";

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                } // else none

-                       } // else none

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         } // Else none.

+                       } // Else none.

</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">                $post_type_clauses[] = "( post_type = '" . $post_type . "' AND ( $post_status_sql ) )";

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6712,7 +6712,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">-// Hooks

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Hooks.

</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">@@ -6874,7 +6874,7 @@

<span class="cx" style="display: block; padding: 0 10px">        // Now look for larger loops.

</span><span class="cx" style="display: block; padding: 0 10px">        $loop = wp_find_hierarchy_loop( 'wp_get_post_parent_id', $post_ID, $post_parent );

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! $loop ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return $post_parent; // No loop

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return $post_parent; // No loop.

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">        // Setting $post_parent to the given value causes a loop.

</span></span></pre></div>

<a id="trunksrcwpincludesqueryphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/query.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/query.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/query.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -998,7 +998,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function wp_old_slug_redirect() {

</span><span class="cx" style="display: block; padding: 0 10px">        if ( is_404() && '' !== get_query_var( 'name' ) ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Guess the current post_type based on the query vars.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Guess the current post type based on the query vars.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( get_query_var( 'post_type' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $post_type = get_query_var( 'post_type' );

</span><span class="cx" style="display: block; padding: 0 10px">                } elseif ( get_query_var( 'attachment' ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1016,7 +1016,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $post_type = reset( $post_type );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Do not attempt redirect for hierarchical post types

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Do not attempt redirect for hierarchical post types.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( is_post_type_hierarchical( $post_type ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1061,7 +1061,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">-                wp_redirect( $link, 301 ); // Permanent redirect

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         wp_redirect( $link, 301 ); // Permanent redirect.

</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1084,8 +1084,8 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $query = $wpdb->prepare( "SELECT post_id FROM $wpdb->postmeta, $wpdb->posts WHERE ID = post_id AND post_type = %s AND meta_key = '_wp_old_slug' AND meta_value = %s", $post_type, get_query_var( 'name' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // if year, monthnum, or day have been specified, make our query more precise

-       // just in case there are multiple identical _wp_old_slug values

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If year, monthnum, or day have been specified, make our query more precise

+       // just in case there are multiple identical _wp_old_slug values.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( get_query_var( 'year' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $query .= $wpdb->prepare( ' AND YEAR(post_date) = %d', get_query_var( 'year' ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1133,7 +1133,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $id = (int) $wpdb->get_var( $wpdb->prepare( "SELECT post_id FROM $wpdb->postmeta AS pm_date, $wpdb->posts WHERE ID = post_id AND post_type = %s AND meta_key = '_wp_old_date' AND post_name = %s" . $date_query, $post_type, get_query_var( 'name' ) ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! $id ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Check to see if an old slug matches the old date

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Check to see if an old slug matches the old date.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $id = (int) $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM $wpdb->posts, $wpdb->postmeta AS pm_slug, $wpdb->postmeta AS pm_date WHERE ID = pm_slug.post_id AND ID = pm_date.post_id AND post_type = %s AND pm_slug.meta_key = '_wp_old_slug' AND pm_slug.meta_value = %s AND pm_date.meta_key = '_wp_old_date'" . $date_query, $post_type, get_query_var( 'name' ) ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span></span></pre></div>

<a id="trunksrcwpincludesrestapiclasswprestrequestphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/rest-api/class-wp-rest-request.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rest-api/class-wp-rest-request.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/rest-api/class-wp-rest-request.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -446,7 +446,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $params = array();

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $order as $type ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // array_merge / the "+" operator will mess up

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // array_merge() / the "+" operator will mess up

</ins><span class="cx" style="display: block; padding: 0 10px">                         // numeric keys, so instead do a manual foreach.

</span><span class="cx" style="display: block; padding: 0 10px">                        foreach ( (array) $this->params[ $type ] as $key => $value ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $params[ $key ] = $value;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -674,6 +674,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->params['JSON'] = $params;

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 return true;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -783,10 +784,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( empty( $this->params[ $type ] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                continue;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                         foreach ( $this->params[ $type ] as $key => $value ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( ! isset( $attributes['args'][ $key ] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        continue;

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $param_args = $attributes['args'][ $key ];

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                                // If the arg has a type but no sanitize_callback attribute, default to rest_parse_request_arg.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -988,7 +991,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $api_url_part = substr( $url, strlen( untrailingslashit( $api_root ) ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $route        = parse_url( $api_url_part, PHP_URL_PATH );

</span><span class="cx" style="display: block; padding: 0 10px">                } elseif ( ! empty( $query_params['rest_route'] ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // ?rest_route=... set directly

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // ?rest_route=... set directly.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $route = $query_params['rest_route'];

</span><span class="cx" style="display: block; padding: 0 10px">                        unset( $query_params['rest_route'] );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span></span></pre></div>

<a id="trunksrcwpincludesrestapiclasswprestresponsephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/rest-api/class-wp-rest-response.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rest-api/class-wp-rest-response.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/rest-api/class-wp-rest-response.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -154,6 +154,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( 'title' === $key ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $value = '"' . $value . '"';

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                         $header .= '; ' . $key . '=' . $value;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">                $this->header( 'Link', $header, false );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -231,6 +232,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                if ( is_array( $this->get_data() ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $data = $this->get_data();

</span><span class="cx" style="display: block; padding: 0 10px">                        $error->add( $data['code'], $data['message'], $data['data'] );

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( ! empty( $data['additional_errors'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                foreach ( $data['additional_errors'] as $err ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        $error->add( $err['code'], $err['message'], $err['data'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -285,6 +287,7 @@

<span class="cx" style="display: block; padding: 0 10px">                 * @param array $additional Additional CURIEs to register with the API.

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                $additional = apply_filters( 'rest_response_link_curies', array() );

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 return array_merge( $curies, $additional );

</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="trunksrcwpincludesrestapiclasswprestserverphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/rest-api/class-wp-rest-server.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rest-api/class-wp-rest-server.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/rest-api/class-wp-rest-server.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -414,10 +414,16 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $result = wp_json_encode( $result );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $json_error_message = $this->get_json_last_error();

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( $json_error_message ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $json_error_obj = new WP_Error( 'rest_encode_error', $json_error_message, array( 'status' => 500 ) );

-                               $result         = $this->error_to_response( $json_error_obj );

-                               $result         = wp_json_encode( $result->data[0] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $json_error_obj = new WP_Error(

+                                       'rest_encode_error',

+                                       $json_error_message,

+                                       array( 'status' => 500 )

+                               );

+

+                               $result = $this->error_to_response( $json_error_obj );

+                               $result = wp_json_encode( $result->data[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">                        if ( $jsonp_callback ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -428,6 +434,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                echo $result;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 return null;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -453,6 +460,7 @@

<span class="cx" style="display: block; padding: 0 10px">                        // Convert links to part of the data.

</span><span class="cx" style="display: block; padding: 0 10px">                        $data['_links'] = $links;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $embed ) {

<span class="cx" style="display: block; padding: 0 10px">                        // Determine if this is a numeric array.

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( wp_is_numeric_array( $data ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -478,6 +486,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public static function get_response_links( $response ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $links = $response->get_links();

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( empty( $links ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return array();

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -846,6 +855,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">                        $args = array();

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                         foreach ( $matches as $param => $value ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( ! is_int( $param ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        $args[ $param ] = $value;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -866,7 +876,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( ! is_callable( $callback ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        $response = new WP_Error( 'rest_invalid_handler', __( 'The handler for the route is invalid' ), array( 'status' => 500 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 $response = new WP_Error(

+                                               'rest_invalid_handler',

+                                               __( 'The handler for the route is invalid' ),

+                                               array( 'status' => 500 )

+                                       );

</ins><span class="cx" style="display: block; padding: 0 10px">                                 }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( ! is_wp_error( $response ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -923,7 +937,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                                if ( is_wp_error( $permission ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                        $response = $permission;

</span><span class="cx" style="display: block; padding: 0 10px">                                                } elseif ( false === $permission || null === $permission ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                        $response = new WP_Error( 'rest_forbidden', __( 'Sorry, you are not allowed to do that.' ), array( 'status' => rest_authorization_required_code() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 $response = new WP_Error(

+                                                               'rest_forbidden',

+                                                               __( 'Sorry, you are not allowed to do that.' ),

+                                                               array( 'status' => rest_authorization_required_code() )

+                                                       );

</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">@@ -987,7 +1005,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return $this->error_to_response( new WP_Error( 'rest_no_route', __( 'No route was found matching the URL and request method' ), array( 'status' => 404 ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return $this->error_to_response(

+                       new WP_Error(

+                               'rest_no_route',

+                               __( 'No route was found matching the URL and request method' ),

+                               array( 'status' => 404 )

+                       )

+               );

</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">@@ -1069,7 +1093,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $namespace = $request['namespace'];

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! isset( $this->namespaces[ $namespace ] ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_invalid_namespace', __( 'The specified namespace could not be found.' ), array( 'status' => 404 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_invalid_namespace',

+                               __( 'The specified namespace could not be found.' ),

+                               array( 'status' => 404 )

+                       );

</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">                $routes    = $this->namespaces[ $namespace ];

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1186,6 +1214,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( isset( $callback['args'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $endpoint_data['args'] = array();

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                                 foreach ( $callback['args'] as $key => $opts ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        $arg_data = array(

</span><span class="cx" style="display: block; padding: 0 10px">                                                'required' => ! empty( $opts['required'] ),

</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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,7 +94,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! current_user_can( 'upload_files' ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_cannot_create', __( 'Sorry, you are not allowed to upload media on this site.' ), array( 'status' => 400 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_cannot_create',

+                               __( 'Sorry, you are not allowed to upload media on this site.' ),

+                               array( 'status' => 400 )

+                       );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Attaching media to a post requires ability to edit said post.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -103,7 +107,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $post_parent_type = get_post_type_object( $parent->post_type );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! current_user_can( $post_parent_type->cap->edit_post, $request['post'] ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                return new WP_Error( 'rest_cannot_edit', __( 'Sorry, you are not allowed to upload media to this post.' ), array( 'status' => rest_authorization_required_code() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         return new WP_Error(

+                                       'rest_cannot_edit',

+                                       __( 'Sorry, you are not allowed to upload media to this post.' ),

+                                       array( 'status' => rest_authorization_required_code() )

+                               );

</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">@@ -119,9 +127,12 @@

<span class="cx" style="display: block; padding: 0 10px">         * @return WP_REST_Response|WP_Error Response object on success, WP_Error object on failure.

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function create_item( $request ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-

</del><span class="cx" style="display: block; padding: 0 10px">                 if ( ! empty( $request['post'] ) && in_array( get_post_type( $request['post'] ), array( 'revision', 'attachment' ), true ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_invalid_param', __( 'Invalid parent type.' ), array( 'status' => 400 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_invalid_param',

+                               __( 'Invalid parent type.' ),

+                               array( 'status' => 400 )

+                       );

</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">                $insert = $this->insert_attachment( $request );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -213,7 +224,7 @@

<span class="cx" style="display: block; padding: 0 10px">                // Include image functions to get access to wp_read_image_metadata().

</span><span class="cx" style="display: block; padding: 0 10px">                require_once ABSPATH . 'wp-admin/includes/image.php';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // use image exif/iptc data for title and caption defaults if possible

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Use image exif/iptc data for title and caption defaults if possible.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $image_meta = 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">                if ( ! empty( $image_meta ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -278,7 +289,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function update_item( $request ) {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! empty( $request['post'] ) && in_array( get_post_type( $request['post'] ), array( 'revision', 'attachment' ), true ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_invalid_param', __( 'Invalid parent type.' ), array( 'status' => 400 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_invalid_param',

+                               __( 'Invalid parent type.' ),

+                               array( 'status' => 400 )

+                       );

</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">                $response = parent::update_item( $request );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -357,7 +372,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        protected function prepare_item_for_database( $request ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $prepared_attachment = parent::prepare_item_for_database( $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">-                // Attachment caption (post_excerpt internally)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Attachment caption (post_excerpt internally).

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( isset( $request['caption'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( is_string( $request['caption'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $prepared_attachment->post_excerpt = $request['caption'];

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -366,7 +381,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">-                // Attachment description (post_content internally)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Attachment description (post_content internally).

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( isset( $request['description'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( is_string( $request['description'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $prepared_attachment->post_content = $request['description'];

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -539,8 +554,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'type'        => 'object',

</span><span class="cx" style="display: block; padding: 0 10px">                        'context'     => array( 'view', 'edit', 'embed' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        'arg_options' => array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                'sanitize_callback' => null, // Note: sanitization implemented in self::prepare_item_for_database()

-                               'validate_callback' => null, // Note: validation implemented in self::prepare_item_for_database()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         'sanitize_callback' => null, // Note: sanitization implemented in self::prepare_item_for_database().

+                               'validate_callback' => null, // Note: validation implemented in self::prepare_item_for_database().

</ins><span class="cx" style="display: block; padding: 0 10px">                         ),

</span><span class="cx" style="display: block; padding: 0 10px">                        'properties'  => array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'raw'      => array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -562,8 +577,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'type'        => 'object',

</span><span class="cx" style="display: block; padding: 0 10px">                        'context'     => array( 'view', 'edit' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        'arg_options' => array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                'sanitize_callback' => null, // Note: sanitization implemented in self::prepare_item_for_database()

-                               'validate_callback' => null, // Note: validation implemented in self::prepare_item_for_database()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         'sanitize_callback' => null, // Note: sanitization implemented in self::prepare_item_for_database().

+                               'validate_callback' => null, // Note: validation implemented in self::prepare_item_for_database().

</ins><span class="cx" style="display: block; padding: 0 10px">                         ),

</span><span class="cx" style="display: block; padding: 0 10px">                        'properties'  => array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'raw'      => array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -627,6 +642,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                unset( $schema['properties']['password'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->schema = $schema;

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 return $this->add_additional_fields_schema( $this->schema );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -641,21 +657,37 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        protected function upload_from_data( $data, $headers ) {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( empty( $data ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_upload_no_data', __( 'No data supplied.' ), array( 'status' => 400 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_upload_no_data',

+                               __( 'No data supplied.' ),

+                               array( 'status' => 400 )

+                       );

</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( $headers['content_type'] ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_upload_no_content_type', __( 'No Content-Type supplied.' ), array( 'status' => 400 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_upload_no_content_type',

+                               __( 'No Content-Type supplied.' ),

+                               array( 'status' => 400 )

+                       );

</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( $headers['content_disposition'] ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_upload_no_content_disposition', __( 'No Content-Disposition supplied.' ), array( 'status' => 400 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_upload_no_content_disposition',

+                               __( 'No Content-Disposition supplied.' ),

+                               array( 'status' => 400 )

+                       );

</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">                $filename = self::get_filename_from_disposition( $headers['content_disposition'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( empty( $filename ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_upload_invalid_disposition', __( 'Invalid Content-Disposition supplied. Content-Disposition needs to be formatted as `attachment; filename="image.png"` or similar.' ), array( 'status' => 400 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_upload_invalid_disposition',

+                               __( 'Invalid Content-Disposition supplied. Content-Disposition needs to be formatted as `attachment; filename="image.png"` or similar.' ),

+                               array( 'status' => 400 )

+                       );

</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( $headers['content_md5'] ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -664,7 +696,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $actual      = md5( $data );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( $expected !== $actual ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                return new WP_Error( 'rest_upload_hash_mismatch', __( 'Content hash did not match expected.' ), array( 'status' => 412 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         return new WP_Error(

+                                       'rest_upload_hash_mismatch',

+                                       __( 'Content hash did not match expected.' ),

+                                       array( 'status' => 412 )

+                               );

</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">@@ -680,7 +716,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $fp = fopen( $tmpfname, 'w+' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! $fp ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_upload_file_error', __( 'Could not open file handle.' ), array( 'status' => 500 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_upload_file_error',

+                               __( 'Could not open file handle.' ),

+                               array( 'status' => 500 )

+                       );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                fwrite( $fp, $data );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -708,7 +748,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                if ( isset( $sideloaded['error'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        @unlink( $tmpfname );

</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 new WP_Error( 'rest_upload_sideload_error', $sideloaded['error'], array( 'status' => 500 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_upload_sideload_error',

+                               $sideloaded['error'],

+                               array( 'status' => 500 )

+                       );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                return $sideloaded;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -824,7 +868,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        protected function upload_from_file( $files, $headers ) {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( empty( $files ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_upload_no_data', __( 'No data supplied.' ), array( 'status' => 400 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_upload_no_data',

+                               __( 'No data supplied.' ),

+                               array( 'status' => 400 )

+                       );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Verify hash, if given.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -834,7 +882,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $actual      = md5_file( $files['file']['tmp_name'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( $expected !== $actual ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                return new WP_Error( 'rest_upload_hash_mismatch', __( 'Content hash did not match expected.' ), array( 'status' => 412 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         return new WP_Error(

+                                       'rest_upload_hash_mismatch',

+                                       __( 'Content hash did not match expected.' ),

+                                       array( 'status' => 412 )

+                               );

</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">@@ -859,7 +911,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $file = wp_handle_upload( $files['file'], $overrides );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( isset( $file['error'] ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_upload_unknown_error', $file['error'], array( 'status' => 500 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_upload_unknown_error',

+                               $file['error'],

+                               array( 'status' => 500 )

+                       );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                return $file;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -912,14 +968,23 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $space_left = get_upload_space_available();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $file_size = filesize( $file['tmp_name'] );

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $space_left < $file_size ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        /* translators: %s: Required disk space in kilobytes. */

-                       return new WP_Error( 'rest_upload_limited_space', sprintf( __( 'Not enough space to upload. %s KB needed.' ), number_format( ( $file_size - $space_left ) / KB_IN_BYTES ) ), array( 'status' => 400 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_upload_limited_space',

+                               /* translators: %s: Required disk space in kilobytes. */

+                               sprintf( __( 'Not enough space to upload. %s KB needed.' ), number_format( ( $file_size - $space_left ) / KB_IN_BYTES ) ),

+                               array( 'status' => 400 )

+                       );

</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 ( $file_size > ( KB_IN_BYTES * get_site_option( 'fileupload_maxk', 1500 ) ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        /* translators: %s: Maximum allowed file size in kilobytes. */

-                       return new WP_Error( 'rest_upload_file_too_big', sprintf( __( 'This file is too big. Files must be less than %s KB in size.' ), get_site_option( 'fileupload_maxk', 1500 ) ), array( 'status' => 400 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_upload_file_too_big',

+                               /* translators: %s: Maximum allowed file size in kilobytes. */

+                               sprintf( __( 'This file is too big. Files must be less than %s KB in size.' ), get_site_option( 'fileupload_maxk', 1500 ) ),

+                               array( 'status' => 400 )

+                       );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Include admin function to get access to upload_is_user_over_quota().

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -926,8 +991,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                require_once ABSPATH . 'wp-admin/includes/ms.php';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( upload_is_user_over_quota( false ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_upload_user_quota_exceeded', __( 'You have used your space quota. Please delete files before uploading.' ), array( 'status' => 400 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_upload_user_quota_exceeded',

+                               __( 'You have used your space quota. Please delete files before uploading.' ),

+                               array( 'status' => 400 )

+                       );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 return true;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunksrcwpincludesrestapiendpointsclasswprestautosavescontrollerphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-autosaves-controller.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-autosaves-controller.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-autosaves-controller.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -161,8 +161,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">                $parent_post_type_obj = get_post_type_object( $parent->post_type );

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! current_user_can( $parent_post_type_obj->cap->edit_post, $parent->ID ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_cannot_read', __( 'Sorry, you are not allowed to view autosaves of this post.' ), array( 'status' => rest_authorization_required_code() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_cannot_read',

+                               __( 'Sorry, you are not allowed to view autosaves of this post.' ),

+                               array( 'status' => rest_authorization_required_code() )

+                       );

</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 true;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -181,8 +186,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function create_item_permissions_check( $request ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $id = $request->get_param( 'id' );

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( empty( $id ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_post_invalid_id', __( 'Invalid item ID.' ), array( 'status' => 404 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_post_invalid_id',

+                               __( 'Invalid item ID.' ),

+                               array( 'status' => 404 )

+                       );

</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 $this->parent_controller->update_item_permissions_check( $request );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -214,7 +224,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ( 'draft' === $post->post_status || 'auto-draft' === $post->post_status ) && $post->post_author == $user_id ) {

<span class="cx" style="display: block; padding: 0 10px">                        // Draft posts for the same author: autosaving updates the post and does not create a revision.

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Convert the post object to an array and add slashes, wp_update_post expects escaped array.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Convert the post object to an array and add slashes, wp_update_post() expects escaped array.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $autosave_id = wp_update_post( wp_slash( (array) $prepared_post ), true );

</span><span class="cx" style="display: block; padding: 0 10px">                } else {

<span class="cx" style="display: block; padding: 0 10px">                        // Non-draft posts: create or update the post autosave.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -246,13 +256,21 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $parent_id = (int) $request->get_param( 'parent' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $parent_id <= 0 ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_post_invalid_id', __( 'Invalid post parent ID.' ), array( 'status' => 404 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_post_invalid_id',

+                               __( 'Invalid post parent ID.' ),

+                               array( 'status' => 404 )

+                       );

</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">                $autosave = wp_get_post_autosave( $parent_id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! $autosave ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_post_no_autosave', __( 'There is no autosave revision for this post.' ), array( 'status' => 404 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_post_no_autosave',

+                               __( 'There is no autosave revision for this post.' ),

+                               array( 'status' => 404 )

+                       );

</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">                $response = $this->prepare_item_for_response( $autosave, $request );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -313,6 +331,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->schema = $schema;

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 return $this->add_additional_fields_schema( $this->schema );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -357,13 +376,17 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! $autosave_is_different ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                wp_delete_post_revision( $old_autosave->ID );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                return new WP_Error( 'rest_autosave_no_changes', __( 'There is nothing to save. The autosave and the post content are the same.' ), array( 'status' => 400 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         return new WP_Error(

+                                       'rest_autosave_no_changes',

+                                       __( 'There is nothing to save. The autosave and the post content are the same.' ),

+                                       array( 'status' => 400 )

+                               );

</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 filter is documented in wp-admin/post.php */

</span><span class="cx" style="display: block; padding: 0 10px">                        do_action( 'wp_creating_autosave', $new_autosave );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // wp_update_post expects escaped array.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // wp_update_post() expects escaped array.

</ins><span class="cx" style="display: block; padding: 0 10px">                         return wp_update_post( wp_slash( $new_autosave ) );

</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="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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-block-renderer-controller.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -150,6 +150,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $data = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'rendered' => $block->render( $request->get_param( 'attributes' ) ),

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 return rest_ensure_response( $data );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -178,6 +179,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                ),

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 return $this->schema;

</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="trunksrcwpincludesrestapiendpointsclasswprestcommentscontrollerphp"></a>

<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-comments-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-comments-controller.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -127,15 +127,27 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                $post = get_post( $post_id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( ! empty( $post_id ) && $post && ! $this->check_read_post_permission( $post, $request ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        return new WP_Error( 'rest_cannot_read_post', __( 'Sorry, you are not allowed to read the post for this comment.' ), array( 'status' => rest_authorization_required_code() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 return new WP_Error(

+                                               'rest_cannot_read_post',

+                                               __( 'Sorry, you are not allowed to read the post for this comment.' ),

+                                               array( 'status' => rest_authorization_required_code() )

+                                       );

</ins><span class="cx" style="display: block; padding: 0 10px">                                 } elseif ( 0 === $post_id && ! current_user_can( 'moderate_comments' ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        return new WP_Error( 'rest_cannot_read', __( 'Sorry, you are not allowed to read comments without a post.' ), array( 'status' => rest_authorization_required_code() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 return new WP_Error(

+                                               'rest_cannot_read',

+                                               __( 'Sorry, you are not allowed to read comments without a post.' ),

+                                               array( 'status' => rest_authorization_required_code() )

+                                       );

</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="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! empty( $request['context'] ) && 'edit' === $request['context'] && ! current_user_can( 'moderate_comments' ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_forbidden_context', __( 'Sorry, you are not allowed to edit comments.' ), array( 'status' => rest_authorization_required_code() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_forbidden_context',

+                               __( 'Sorry, you are not allowed to edit comments.' ),

+                               array( 'status' => rest_authorization_required_code() )

+                       );

</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 ( ! current_user_can( 'edit_posts' ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -322,7 +334,12 @@

<span class="cx" style="display: block; padding: 0 10px">         * @return WP_Comment|WP_Error Comment object if ID is valid, WP_Error otherwise.

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        protected function get_comment( $id ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $error = new WP_Error( 'rest_comment_invalid_id', __( 'Invalid comment ID.' ), array( 'status' => 404 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $error = new WP_Error(

+                       'rest_comment_invalid_id',

+                       __( 'Invalid comment ID.' ),

+                       array( 'status' => 404 )

+               );

+

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( (int) $id <= 0 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return $error;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -335,8 +352,13 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! empty( $comment->comment_post_ID ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $post = get_post( (int) $comment->comment_post_ID );

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( empty( $post ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                return new WP_Error( 'rest_post_invalid_id', __( 'Invalid post ID.' ), array( 'status' => 404 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         return new WP_Error(

+                                       'rest_post_invalid_id',

+                                       __( 'Invalid post ID.' ),

+                                       array( 'status' => 404 )

+                               );

</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">@@ -358,17 +380,29 @@

</span><span class="cx" style="display: 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['context'] ) && 'edit' === $request['context'] && ! current_user_can( 'moderate_comments' ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_forbidden_context', __( 'Sorry, you are not allowed to edit comments.' ), array( 'status' => rest_authorization_required_code() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_forbidden_context',

+                               __( 'Sorry, you are not allowed to edit comments.' ),

+                               array( 'status' => rest_authorization_required_code() )

+                       );

</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">                $post = get_post( $comment->comment_post_ID );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! $this->check_read_permission( $comment, $request ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_cannot_read', __( 'Sorry, you are not allowed to read this comment.' ), array( 'status' => rest_authorization_required_code() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_cannot_read',

+                               __( 'Sorry, you are not allowed to read this comment.' ),

+                               array( 'status' => rest_authorization_required_code() )

+                       );

</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 && ! $this->check_read_post_permission( $post, $request ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_cannot_read_post', __( 'Sorry, you are not allowed to read the post for this comment.' ), array( 'status' => rest_authorization_required_code() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_cannot_read_post',

+                               __( 'Sorry, you are not allowed to read the post for this comment.' ),

+                               array( 'status' => rest_authorization_required_code() )

+                       );

</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 true;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -405,7 +439,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function create_item_permissions_check( $request ) {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! is_user_logged_in() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( get_option( 'comment_registration' ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                return new WP_Error( 'rest_comment_login_required', __( 'Sorry, you must be logged in to comment.' ), array( 'status' => 401 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         return new WP_Error(

+                                       'rest_comment_login_required',

+                                       __( 'Sorry, you must be logged in to comment.' ),

+                                       array( 'status' => 401 )

+                               );

</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">@@ -421,8 +459,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                         *                                 response.

</span><span class="cx" style="display: block; padding: 0 10px">                         */

</span><span class="cx" style="display: block; padding: 0 10px">                        $allow_anonymous = apply_filters( 'rest_allow_anonymous_comments', false, $request );

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( ! $allow_anonymous ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                return new WP_Error( 'rest_comment_login_required', __( 'Sorry, you must be logged in to comment.' ), array( 'status' => 401 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         return new WP_Error(

+                                       'rest_comment_login_required',

+                                       __( 'Sorry, you must be logged in to comment.' ),

+                                       array( 'status' => 401 )

+                               );

</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">@@ -457,28 +500,53 @@

</span><span class="cx" style="display: 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['post'] ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_comment_invalid_post_id', __( 'Sorry, you are not allowed to create this comment without a post.' ), array( 'status' => 403 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_comment_invalid_post_id',

+                               __( 'Sorry, you are not allowed to create this comment without a post.' ),

+                               array( 'status' => 403 )

+                       );

</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">                $post = get_post( (int) $request['post'] );

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! $post ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_comment_invalid_post_id', __( 'Sorry, you are not allowed to create this comment without a post.' ), array( 'status' => 403 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_comment_invalid_post_id',

+                               __( 'Sorry, you are not allowed to create this comment without a post.' ),

+                               array( 'status' => 403 )

+                       );

</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 ( 'draft' === $post->post_status ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_comment_draft_post', __( 'Sorry, you are not allowed to create a comment on this post.' ), array( 'status' => 403 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_comment_draft_post',

+                               __( 'Sorry, you are not allowed to create a comment on this post.' ),

+                               array( 'status' => 403 )

+                       );

</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 ( 'trash' === $post->post_status ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_comment_trash_post', __( 'Sorry, you are not allowed to create a comment on this post.' ), array( 'status' => 403 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_comment_trash_post',

+                               __( 'Sorry, you are not allowed to create a comment on this post.' ),

+                               array( 'status' => 403 )

+                       );

</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 ( ! $this->check_read_post_permission( $post, $request ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_cannot_read_post', __( 'Sorry, you are not allowed to read the post for this comment.' ), array( 'status' => rest_authorization_required_code() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_cannot_read_post',

+                               __( 'Sorry, you are not allowed to read the post for this comment.' ),

+                               array( 'status' => rest_authorization_required_code() )

+                       );

</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 ( ! comments_open( $post->ID ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_comment_closed', __( 'Sorry, comments are closed for this item.' ), array( 'status' => 403 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_comment_closed',

+                               __( 'Sorry, comments are closed for this item.' ),

+                               array( 'status' => 403 )

+                       );

</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 true;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -494,12 +562,20 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function create_item( $request ) {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! empty( $request['id'] ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_comment_exists', __( 'Cannot create existing comment.' ), array( 'status' => 400 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_comment_exists',

+                               __( 'Cannot create existing comment.' ),

+                               array( 'status' => 400 )

+                       );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Do not allow comments to be created with a non-default type.

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! empty( $request['type'] ) && 'comment' !== $request['type'] ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_invalid_comment_type', __( 'Cannot create a comment with that type.' ), array( 'status' => 400 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_invalid_comment_type',

+                               __( 'Cannot create a comment with that type.' ),

+                               array( 'status' => 400 )

+                       );

</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">                $prepared_comment = $this->prepare_item_for_database( $request );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -514,7 +590,11 @@

<span class="cx" style="display: block; padding: 0 10px">                 * comment_content. See wp_handle_comment_submission().

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                if ( empty( $prepared_comment['comment_content'] ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_comment_content_invalid', __( 'Invalid comment content.' ), array( 'status' => 400 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_comment_content_invalid',

+                               __( 'Invalid comment content.' ),

+                               array( 'status' => 400 )

+                       );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Setting remaining values before wp_insert_comment so we can use wp_allow_comment().

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -540,7 +620,11 @@

<span class="cx" style="display: block; padding: 0 10px">                // Honor the discussion setting that requires a name and email address of the comment author.

</span><span class="cx" style="display: block; padding: 0 10px">                if ( get_option( 'require_name_email' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( empty( $prepared_comment['comment_author'] ) || empty( $prepared_comment['comment_author_email'] ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                return new WP_Error( 'rest_comment_author_data_required', __( 'Creating a comment requires valid author name and email values.' ), array( 'status' => 400 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         return new WP_Error(

+                                       'rest_comment_author_data_required',

+                                       __( 'Creating a comment requires valid author name and email values.' ),

+                                       array( 'status' => 400 )

+                               );

</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">@@ -557,9 +641,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $check_comment_lengths = wp_check_comment_data_max_lengths( $prepared_comment );

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( is_wp_error( $check_comment_lengths ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $error_code = $check_comment_lengths->get_error_code();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( $error_code, __( 'Comment field exceeds maximum length allowed.' ), array( 'status' => 400 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               $error_code,

+                               __( 'Comment field exceeds maximum length allowed.' ),

+                               array( 'status' => 400 )

+                       );

</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">                $prepared_comment['comment_approved'] = wp_allow_comment( $prepared_comment, true );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -569,11 +658,19 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $error_message = $prepared_comment['comment_approved']->get_error_message();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( 'comment_duplicate' === $error_code ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                return new WP_Error( $error_code, $error_message, array( 'status' => 409 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         return new WP_Error(

+                                       $error_code,

+                                       $error_message,

+                                       array( 'status' => 409 )

+                               );

</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 ( 'comment_flood' === $error_code ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                return new WP_Error( $error_code, $error_message, array( 'status' => 400 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         return new WP_Error(

+                                       $error_code,

+                                       $error_message,

+                                       array( 'status' => 400 )

+                               );

</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 $prepared_comment['comment_approved'];

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -600,7 +697,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $comment_id = wp_insert_comment( wp_filter_comment( wp_slash( (array) $prepared_comment ) ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! $comment_id ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_comment_failed_create', __( 'Creating comment failed.' ), array( 'status' => 500 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_comment_failed_create',

+                               __( 'Creating comment failed.' ),

+                               array( 'status' => 500 )

+                       );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( isset( $request['status'] ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -676,7 +777,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! $this->check_edit_permission( $comment ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_cannot_edit', __( 'Sorry, you are not allowed to edit this comment.' ), array( 'status' => rest_authorization_required_code() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_cannot_edit',

+                               __( 'Sorry, you are not allowed to edit this comment.' ),

+                               array( 'status' => rest_authorization_required_code() )

+                       );

</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 true;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -699,7 +804,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $id = $comment->comment_ID;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( isset( $request['type'] ) && get_comment_type( $id ) !== $request['type'] ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_comment_invalid_type', __( 'Sorry, you are not allowed to change the comment type.' ), array( 'status' => 404 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_comment_invalid_type',

+                               __( 'Sorry, you are not allowed to change the comment type.' ),

+                               array( 'status' => 404 )

+                       );

</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">                $prepared_args = $this->prepare_item_for_database( $request );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -710,8 +819,13 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! empty( $prepared_args['comment_post_ID'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $post = get_post( $prepared_args['comment_post_ID'] );

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( empty( $post ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                return new WP_Error( 'rest_comment_invalid_post_id', __( 'Invalid post ID.' ), array( 'status' => 403 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         return new WP_Error(

+                                       'rest_comment_invalid_post_id',

+                                       __( 'Invalid post ID.' ),

+                                       array( 'status' => 403 )

+                               );

</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">@@ -720,7 +834,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $change = $this->handle_status_param( $request['status'], $id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! $change ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                return new WP_Error( 'rest_comment_failed_edit', __( 'Updating comment status failed.' ), array( 'status' => 500 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         return new WP_Error(

+                                       'rest_comment_failed_edit',

+                                       __( 'Updating comment status failed.' ),

+                                       array( 'status' => 500 )

+                               );

</ins><span class="cx" style="display: block; padding: 0 10px">                         }

</span><span class="cx" style="display: block; padding: 0 10px">                } elseif ( ! empty( $prepared_args ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( is_wp_error( $prepared_args ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -728,21 +846,34 @@

</span><span class="cx" style="display: 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( $prepared_args['comment_content'] ) && empty( $prepared_args['comment_content'] ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                return new WP_Error( 'rest_comment_content_invalid', __( 'Invalid comment content.' ), array( 'status' => 400 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         return new WP_Error(

+                                       'rest_comment_content_invalid',

+                                       __( 'Invalid comment content.' ),

+                                       array( 'status' => 400 )

+                               );

</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">                        $prepared_args['comment_ID'] = $id;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $check_comment_lengths = wp_check_comment_data_max_lengths( $prepared_args );

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( is_wp_error( $check_comment_lengths ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $error_code = $check_comment_lengths->get_error_code();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                return new WP_Error( $error_code, __( 'Comment field exceeds maximum length allowed.' ), array( 'status' => 400 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         return new WP_Error(

+                                       $error_code,

+                                       __( 'Comment field exceeds maximum length allowed.' ),

+                                       array( 'status' => 400 )

+                               );

</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">                        $updated = wp_update_comment( wp_slash( (array) $prepared_args ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( false === $updated ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                return new WP_Error( 'rest_comment_failed_edit', __( 'Updating comment failed.' ), array( 'status' => 500 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         return new WP_Error(

+                                       'rest_comment_failed_edit',

+                                       __( 'Updating comment failed.' ),

+                                       array( 'status' => 500 )

+                               );

</ins><span class="cx" style="display: block; padding: 0 10px">                         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( isset( $request['status'] ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -796,7 +927,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! $this->check_edit_permission( $comment ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_cannot_delete', __( 'Sorry, you are not allowed to delete this comment.' ), array( 'status' => rest_authorization_required_code() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_cannot_delete',

+                               __( 'Sorry, you are not allowed to delete this comment.' ),

+                               array( 'status' => rest_authorization_required_code() )

+                       );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px">                return true;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -844,12 +979,20 @@

</span><span class="cx" style="display: block; padding: 0 10px">                } else {

<span class="cx" style="display: block; padding: 0 10px">                        // If this type doesn't support trashing, error out.

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! $supports_trash ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                /* translators: %s: force=true */

-                               return new WP_Error( 'rest_trash_not_supported', sprintf( __( "The comment does not support trashing. Set '%s' to delete." ), 'force=true' ), array( 'status' => 501 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         return new WP_Error(

+                                       'rest_trash_not_supported',

+                                       /* translators: %s: force=true */

+                                       sprintf( __( "The comment does not support trashing. Set '%s' to delete." ), 'force=true' ),

+                                       array( 'status' => 501 )

+                               );

</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 ( 'trash' === $comment->comment_approved ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                return new WP_Error( 'rest_already_trashed', __( 'The comment has already been trashed.' ), array( 'status' => 410 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         return new WP_Error(

+                                       'rest_already_trashed',

+                                       __( 'The comment has already been trashed.' ),

+                                       array( 'status' => 410 )

+                               );

</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">                        $result   = wp_trash_comment( $comment->comment_ID );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -858,7 +1001,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! $result ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_cannot_delete', __( 'The comment cannot be deleted.' ), array( 'status' => 500 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_cannot_delete',

+                               __( 'The comment cannot be deleted.' ),

+                               array( 'status' => 500 )

+                       );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1155,7 +1302,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                $prepared_comment['comment_author_email'] = $user->user_email;

</span><span class="cx" style="display: block; padding: 0 10px">                                $prepared_comment['comment_author_url']   = $user->user_url;

</span><span class="cx" style="display: block; padding: 0 10px">                        } else {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                return new WP_Error( 'rest_comment_author_invalid', __( 'Invalid comment author ID.' ), array( 'status' => 400 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         return new WP_Error(

+                                       'rest_comment_author_invalid',

+                                       __( 'Invalid comment author ID.' ),

+                                       array( 'status' => 400 )

+                               );

</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">@@ -1247,7 +1398,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        'context'     => array( 'edit' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                        'arg_options' => array(

</span><span class="cx" style="display: block; padding: 0 10px">                                                'sanitize_callback' => array( $this, 'check_comment_author_email' ),

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                'validate_callback' => null, // skip built-in validation of 'email'.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         'validate_callback' => null, // Skip built-in validation of 'email'.

</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">                                'author_ip'         => array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1283,8 +1434,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        'type'        => 'object',

</span><span class="cx" style="display: block; padding: 0 10px">                                        'context'     => array( 'view', 'edit', 'embed' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                        'arg_options' => array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                'sanitize_callback' => null, // Note: sanitization implemented in self::prepare_item_for_database()

-                                               'validate_callback' => null, // Note: validation implemented in self::prepare_item_for_database()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         'sanitize_callback' => null, // Note: sanitization implemented in self::prepare_item_for_database().

+                                               'validate_callback' => null, // Note: validation implemented in self::prepare_item_for_database().

</ins><span class="cx" style="display: block; padding: 0 10px">                                         ),

</span><span class="cx" style="display: block; padding: 0 10px">                                        'properties'  => array(

</span><span class="cx" style="display: block; padding: 0 10px">                                                'raw'      => array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1352,6 +1503,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $avatar_properties = array();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $avatar_sizes = rest_get_avatar_sizes();

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                         foreach ( $avatar_sizes as $size ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $avatar_properties[ $size ] = array(

</span><span class="cx" style="display: block; padding: 0 10px">                                        /* translators: %d: Avatar image size in pixels. */

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1374,6 +1526,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $schema['properties']['meta'] = $this->meta->get_field_schema();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->schema = $schema;

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 return $this->add_additional_fields_schema( $this->schema );

</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="trunksrcwpincludesrestapiendpointsclasswprestcontrollerphp"></a>

<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-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-controller.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-controller.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,8 +44,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @since 4.7.0

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function register_routes() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                /* translators: %s: register_routes() */

-               _doing_it_wrong( 'WP_REST_Controller::register_routes', sprintf( __( "Method '%s' must be overridden." ), __METHOD__ ), '4.7' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         _doing_it_wrong(

+                       'WP_REST_Controller::register_routes',

+                       /* translators: %s: register_routes() */

+                       sprintf( __( "Method '%s' must be overridden." ), __METHOD__ ),

+                       '4.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">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,8 +61,12 @@

<span class="cx" style="display: block; padding: 0 10px">         * @return true|WP_Error True if the request has read access, WP_Error object otherwise.

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function get_items_permissions_check( $request ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                /* translators: %s: Method name. */

-               return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array( 'status' => 405 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return new WP_Error(

+                       'invalid-method',

+                       /* translators: %s: Method name. */

+                       sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ),

+                       array( 'status' => 405 )

+               );

</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">@@ -70,8 +78,12 @@

<span class="cx" style="display: block; padding: 0 10px">         * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function get_items( $request ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                /* translators: %s: Method name. */

-               return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array( 'status' => 405 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return new WP_Error(

+                       'invalid-method',

+                       /* translators: %s: Method name. */

+                       sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ),

+                       array( 'status' => 405 )

+               );

</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">@@ -83,8 +95,12 @@

<span class="cx" style="display: block; padding: 0 10px">         * @return true|WP_Error True if the request has read access for the item, WP_Error object otherwise.

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function get_item_permissions_check( $request ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                /* translators: %s: Method name. */

-               return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array( 'status' => 405 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return new WP_Error(

+                       'invalid-method',

+                       /* translators: %s: Method name. */

+                       sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ),

+                       array( 'status' => 405 )

+               );

</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">@@ -96,8 +112,12 @@

<span class="cx" style="display: block; padding: 0 10px">         * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function get_item( $request ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                /* translators: %s: Method name. */

-               return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array( 'status' => 405 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return new WP_Error(

+                       'invalid-method',

+                       /* translators: %s: Method name. */

+                       sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ),

+                       array( 'status' => 405 )

+               );

</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">@@ -109,8 +129,12 @@

<span class="cx" style="display: block; padding: 0 10px">         * @return true|WP_Error True if the request has access to create items, WP_Error object otherwise.

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function create_item_permissions_check( $request ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                /* translators: %s: Method name. */

-               return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array( 'status' => 405 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return new WP_Error(

+                       'invalid-method',

+                       /* translators: %s: Method name. */

+                       sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ),

+                       array( 'status' => 405 )

+               );

</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">@@ -122,8 +146,12 @@

<span class="cx" style="display: block; padding: 0 10px">         * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function create_item( $request ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                /* translators: %s: Method name. */

-               return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array( 'status' => 405 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return new WP_Error(

+                       'invalid-method',

+                       /* translators: %s: Method name. */

+                       sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ),

+                       array( 'status' => 405 )

+               );

</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">@@ -135,8 +163,12 @@

<span class="cx" style="display: block; padding: 0 10px">         * @return true|WP_Error True if the request has access to update the item, WP_Error object otherwise.

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function update_item_permissions_check( $request ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                /* translators: %s: Method name. */

-               return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array( 'status' => 405 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return new WP_Error(

+                       'invalid-method',

+                       /* translators: %s: Method name. */

+                       sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ),

+                       array( 'status' => 405 )

+               );

</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">@@ -148,8 +180,12 @@

<span class="cx" style="display: block; padding: 0 10px">         * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function update_item( $request ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                /* translators: %s: Method name. */

-               return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array( 'status' => 405 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return new WP_Error(

+                       'invalid-method',

+                       /* translators: %s: Method name. */

+                       sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ),

+                       array( 'status' => 405 )

+               );

</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">@@ -161,8 +197,12 @@

<span class="cx" style="display: block; padding: 0 10px">         * @return true|WP_Error True if the request has access to delete the item, WP_Error object otherwise.

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function delete_item_permissions_check( $request ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                /* translators: %s: Method name. */

-               return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array( 'status' => 405 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return new WP_Error(

+                       'invalid-method',

+                       /* translators: %s: Method name. */

+                       sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ),

+                       array( 'status' => 405 )

+               );

</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">@@ -174,8 +214,12 @@

<span class="cx" style="display: block; padding: 0 10px">         * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function delete_item( $request ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                /* translators: %s: Method name. */

-               return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array( 'status' => 405 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return new WP_Error(

+                       'invalid-method',

+                       /* translators: %s: Method name. */

+                       sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ),

+                       array( 'status' => 405 )

+               );

</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">@@ -187,8 +231,12 @@

<span class="cx" style="display: block; padding: 0 10px">         * @return object|WP_Error The prepared item, or WP_Error object on failure.

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        protected function prepare_item_for_database( $request ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                /* translators: %s: Method name. */

-               return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array( 'status' => 405 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return new WP_Error(

+                       'invalid-method',

+                       /* translators: %s: Method name. */

+                       sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ),

+                       array( 'status' => 405 )

+               );

</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">@@ -201,8 +249,12 @@

<span class="cx" style="display: block; padding: 0 10px">         * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function prepare_item_for_response( $item, $request ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                /* translators: %s: Method name. */

-               return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array( 'status' => 405 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return new WP_Error(

+                       'invalid-method',

+                       /* translators: %s: Method name. */

+                       sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ),

+                       array( 'status' => 405 )

+               );

</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">@@ -391,7 +443,6 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $requested_fields = $this->get_fields_for_response( $request );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $additional_fields as $field_name => $field_options ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-

</del><span class="cx" style="display: block; padding: 0 10px">                         if ( ! $field_options['get_callback'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                continue;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -529,6 +580,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $properties = isset( $schema['properties'] ) ? $schema['properties'] : array();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $additional_fields = $this->get_additional_fields();

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $additional_fields as $field_name => $field_options ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        // For back-compat, include any field with an empty schema

<span class="cx" style="display: block; padding: 0 10px">                        // because it won't be present in $this->get_item_schema().

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -572,8 +624,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                }

<span class="cx" style="display: block; padding: 0 10px">                                // Check for nested fields if $field is not a direct match.

</span><span class="cx" style="display: block; padding: 0 10px">                                $nested_fields = explode( '.', $field );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // A nested field is included so long as its top-level property is

-                               // present in the schema.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // A nested field is included so long as its top-level property

+                               // is present in the schema.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( in_array( $nested_fields[0], $fields, true ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        $response_fields[] = $field;

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span></span></pre></div>

<a id="trunksrcwpincludesrestapiendpointsclasswprestpoststatusescontrollerphp"></a>

<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-post-statuses-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-post-statuses-controller.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-post-statuses-controller.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -90,7 +90,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_cannot_view', __( 'Sorry, you are not allowed to manage post statuses.' ), array( 'status' => rest_authorization_required_code() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_cannot_view',

+                               __( 'Sorry, you are not allowed to manage post statuses.' ),

+                               array( 'status' => rest_authorization_required_code() )

+                       );

</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 true;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -135,13 +139,21 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $status = get_post_status_object( $request['status'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( empty( $status ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_status_invalid', __( 'Invalid status.' ), array( 'status' => 404 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_status_invalid',

+                               __( 'Invalid status.' ),

+                               array( 'status' => 404 )

+                       );

</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">                $check = $this->check_read_permission( $status );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! $check ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_cannot_read_status', __( 'Cannot view status.' ), array( 'status' => rest_authorization_required_code() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_cannot_read_status',

+                               __( 'Cannot view status.' ),

+                               array( 'status' => rest_authorization_required_code() )

+                       );

</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 true;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -185,7 +197,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $obj = get_post_status_object( $request['status'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( empty( $obj ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_status_invalid', __( 'Invalid status.' ), array( 'status' => 404 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_status_invalid',

+                               __( 'Invalid status.' ),

+                               array( 'status' => 404 )

+                       );

</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">                $data = $this->prepare_item_for_response( $obj, $request );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -334,6 +350,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->schema = $schema;

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 return $this->add_additional_fields_schema( $this->schema );

</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="trunksrcwpincludesrestapiendpointsclasswprestposttypescontrollerphp"></a>

<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-post-types-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-post-types-controller.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-post-types-controller.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -89,7 +89,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_cannot_view', __( 'Sorry, you are not allowed to edit posts in this post type.' ), array( 'status' => rest_authorization_required_code() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_cannot_view',

+                               __( 'Sorry, you are not allowed to edit posts in this post type.' ),

+                               array( 'status' => rest_authorization_required_code() )

+                       );

</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 true;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -131,15 +135,27 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $obj = get_post_type_object( $request['type'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( empty( $obj ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_type_invalid', __( 'Invalid post type.' ), array( 'status' => 404 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_type_invalid',

+                               __( 'Invalid post type.' ),

+                               array( 'status' => 404 )

+                       );

</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( $obj->show_in_rest ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_cannot_read_type', __( 'Cannot view post type.' ), array( 'status' => rest_authorization_required_code() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_cannot_read_type',

+                               __( 'Cannot view post type.' ),

+                               array( 'status' => rest_authorization_required_code() )

+                       );

</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 ( 'edit' === $request['context'] && ! current_user_can( $obj->cap->edit_posts ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_forbidden_context', __( 'Sorry, you are not allowed to edit posts in this post type.' ), array( 'status' => rest_authorization_required_code() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_forbidden_context',

+                               __( 'Sorry, you are not allowed to edit posts in this post type.' ),

+                               array( 'status' => rest_authorization_required_code() )

+                       );

</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">                $data = $this->prepare_item_for_response( $obj, $request );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -321,6 +337,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->schema = $schema;

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 return $this->add_additional_fields_schema( $this->schema );

</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="trunksrcwpincludesrestapiendpointsclasswprestpostscontrollerphp"></a>

<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-posts-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-posts-controller.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -138,7 +138,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $post_type = get_post_type_object( $this->post_type );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( 'edit' === $request['context'] && ! current_user_can( $post_type->cap->edit_posts ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_forbidden_context', __( 'Sorry, you are not allowed to edit posts in this post type.' ), array( 'status' => rest_authorization_required_code() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_forbidden_context',

+                               __( 'Sorry, you are not allowed to edit posts in this post type.' ),

+                               array( 'status' => rest_authorization_required_code() )

+                       );

</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 true;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -156,12 +160,20 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Ensure a search string is set in case the orderby is set to 'relevance'.

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! empty( $request['orderby'] ) && 'relevance' === $request['orderby'] && empty( $request['search'] ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_no_search_term_defined', __( 'You need to define a search term to order by relevance.' ), array( 'status' => 400 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_no_search_term_defined',

+                               __( 'You need to define a search term to order by relevance.' ),

+                               array( 'status' => 400 )

+                       );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Ensure an include parameter is set in case the orderby is set to 'include'.

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! empty( $request['orderby'] ) && 'include' === $request['orderby'] && empty( $request['include'] ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_orderby_include_missing_include', __( 'You need to define an include parameter to order by include.' ), array( 'status' => 400 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_orderby_include_missing_include',

+                               __( 'You need to define an include parameter to order by include.' ),

+                               array( 'status' => 400 )

+                       );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Retrieve the list of registered collection query parameters.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -337,7 +349,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $max_pages = ceil( $total_posts / (int) $posts_query->query_vars['posts_per_page'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $page > $max_pages && $total_posts > 0 ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_post_invalid_page_number', __( 'The page number requested is larger than the number of pages available.' ), array( 'status' => 400 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_post_invalid_page_number',

+                               __( 'The page number requested is larger than the number of pages available.' ),

+                               array( 'status' => 400 )

+                       );

</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">                $response = rest_ensure_response( $posts );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -377,7 +393,12 @@

<span class="cx" style="display: block; padding: 0 10px">         * @return WP_Post|WP_Error Post object if ID is valid, WP_Error otherwise.

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        protected function get_post( $id ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $error = new WP_Error( 'rest_post_invalid_id', __( 'Invalid post ID.' ), array( 'status' => 404 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $error = new WP_Error(

+                       'rest_post_invalid_id',

+                       __( 'Invalid post ID.' ),

+                       array( 'status' => 404 )

+               );

+

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( (int) $id <= 0 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return $error;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -405,13 +426,21 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( 'edit' === $request['context'] && $post && ! $this->check_update_permission( $post ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_forbidden_context', __( 'Sorry, you are not allowed to edit this post.' ), array( 'status' => rest_authorization_required_code() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_forbidden_context',

+                               __( 'Sorry, you are not allowed to edit this post.' ),

+                               array( 'status' => rest_authorization_required_code() )

+                       );

</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 && ! empty( $request['password'] ) ) {

<span class="cx" style="display: block; padding: 0 10px">                        // Check post password, and return error if invalid.

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! hash_equals( $post->post_password, $request['password'] ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                return new WP_Error( 'rest_post_incorrect_password', __( 'Incorrect post password.' ), array( 'status' => 403 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         return new WP_Error(

+                                       'rest_post_incorrect_password',

+                                       __( 'Incorrect post password.' ),

+                                       array( 'status' => 403 )

+                               );

</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">@@ -493,25 +522,45 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function create_item_permissions_check( $request ) {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! empty( $request['id'] ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_post_exists', __( 'Cannot create existing post.' ), array( 'status' => 400 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_post_exists',

+                               __( 'Cannot create existing post.' ),

+                               array( 'status' => 400 )

+                       );

</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">                $post_type = get_post_type_object( $this->post_type );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! empty( $request['author'] ) && get_current_user_id() !== $request['author'] && ! current_user_can( $post_type->cap->edit_others_posts ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_cannot_edit_others', __( 'Sorry, you are not allowed to create posts as this user.' ), array( 'status' => rest_authorization_required_code() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_cannot_edit_others',

+                               __( 'Sorry, you are not allowed to create posts as this user.' ),

+                               array( 'status' => rest_authorization_required_code() )

+                       );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! empty( $request['sticky'] ) && ! current_user_can( $post_type->cap->edit_others_posts ) && ! current_user_can( $post_type->cap->publish_posts ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_cannot_assign_sticky', __( 'Sorry, you are not allowed to make posts sticky.' ), array( 'status' => rest_authorization_required_code() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_cannot_assign_sticky',

+                               __( 'Sorry, you are not allowed to make posts sticky.' ),

+                               array( 'status' => rest_authorization_required_code() )

+                       );

</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 ( ! current_user_can( $post_type->cap->create_posts ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_cannot_create', __( 'Sorry, you are not allowed to create posts as this user.' ), array( 'status' => rest_authorization_required_code() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_cannot_create',

+                               __( 'Sorry, you are not allowed to create posts as this user.' ),

+                               array( 'status' => rest_authorization_required_code() )

+                       );

</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 ( ! $this->check_assign_terms_permission( $request ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_cannot_assign_term', __( 'Sorry, you are not allowed to assign the provided terms.' ), array( 'status' => rest_authorization_required_code() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_cannot_assign_term',

+                               __( 'Sorry, you are not allowed to assign the provided terms.' ),

+                               array( 'status' => rest_authorization_required_code() )

+                       );

</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 true;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -527,7 +576,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function create_item( $request ) {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! empty( $request['id'] ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_post_exists', __( 'Cannot create existing post.' ), array( 'status' => 400 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_post_exists',

+                               __( 'Cannot create existing post.' ),

+                               array( 'status' => 400 )

+                       );

</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">                $prepared_post = $this->prepare_item_for_database( $request );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -650,19 +703,35 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $post_type = get_post_type_object( $this->post_type );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $post && ! $this->check_update_permission( $post ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_cannot_edit', __( 'Sorry, you are not allowed to edit this post.' ), array( 'status' => rest_authorization_required_code() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_cannot_edit',

+                               __( 'Sorry, you are not allowed to edit this post.' ),

+                               array( 'status' => rest_authorization_required_code() )

+                       );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! empty( $request['author'] ) && get_current_user_id() !== $request['author'] && ! current_user_can( $post_type->cap->edit_others_posts ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_cannot_edit_others', __( 'Sorry, you are not allowed to update posts as this user.' ), array( 'status' => rest_authorization_required_code() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_cannot_edit_others',

+                               __( 'Sorry, you are not allowed to update posts as this user.' ),

+                               array( 'status' => rest_authorization_required_code() )

+                       );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! empty( $request['sticky'] ) && ! current_user_can( $post_type->cap->edit_others_posts ) && ! current_user_can( $post_type->cap->publish_posts ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_cannot_assign_sticky', __( 'Sorry, you are not allowed to make posts sticky.' ), array( 'status' => rest_authorization_required_code() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_cannot_assign_sticky',

+                               __( 'Sorry, you are not allowed to make posts sticky.' ),

+                               array( 'status' => rest_authorization_required_code() )

+                       );

</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 ( ! $this->check_assign_terms_permission( $request ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_cannot_assign_term', __( 'Sorry, you are not allowed to assign the provided terms.' ), array( 'status' => rest_authorization_required_code() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_cannot_assign_term',

+                               __( 'Sorry, you are not allowed to assign the provided terms.' ),

+                               array( 'status' => rest_authorization_required_code() )

+                       );

</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 true;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -688,7 +757,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        return $post;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // convert the post object to an array, otherwise wp_update_post will expect non-escaped input.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Convert the post object to an array, otherwise wp_update_post() will expect non-escaped input.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post_id = wp_update_post( wp_slash( (array) $post ), true );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( is_wp_error( $post_id ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -779,7 +848,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $post && ! $this->check_delete_permission( $post ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_cannot_delete', __( 'Sorry, you are not allowed to delete this post.' ), array( 'status' => rest_authorization_required_code() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_cannot_delete',

+                               __( 'Sorry, you are not allowed to delete this post.' ),

+                               array( 'status' => rest_authorization_required_code() )

+                       );

</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 true;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -823,7 +896,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $supports_trash = apply_filters( "rest_{$this->post_type}_trashable", $supports_trash, $post );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! $this->check_delete_permission( $post ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_user_cannot_delete_post', __( 'Sorry, you are not allowed to delete this post.' ), array( 'status' => rest_authorization_required_code() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_user_cannot_delete_post',

+                               __( 'Sorry, you are not allowed to delete this post.' ),

+                               array( 'status' => rest_authorization_required_code() )

+                       );

</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">                $request->set_param( 'context', 'edit' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -842,17 +919,25 @@

</span><span class="cx" style="display: block; padding: 0 10px">                } else {

<span class="cx" style="display: block; padding: 0 10px">                        // If we don't support trashing for this type, error out.

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! $supports_trash ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                /* translators: %s: force=true */

-                               return new WP_Error( 'rest_trash_not_supported', sprintf( __( "The post does not support trashing. Set '%s' to delete." ), 'force=true' ), array( 'status' => 501 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         return new WP_Error(

+                                       'rest_trash_not_supported',

+                                       /* translators: %s: force=true */

+                                       sprintf( __( "The post does not support trashing. Set '%s' to delete." ), 'force=true' ),

+                                       array( 'status' => 501 )

+                               );

</ins><span class="cx" style="display: block; padding: 0 10px">                         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                        // Otherwise, only trash if we haven't already.

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( 'trash' === $post->post_status ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                return new WP_Error( 'rest_already_trashed', __( 'The post has already been deleted.' ), array( 'status' => 410 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         return new WP_Error(

+                                       'rest_already_trashed',

+                                       __( 'The post has already been deleted.' ),

+                                       array( 'status' => 410 )

+                               );

</ins><span class="cx" style="display: block; padding: 0 10px">                         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // (Note that internally this falls through to `wp_delete_post` if

-                       // the trash is disabled.)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // (Note that internally this falls through to `wp_delete_post()`

+                       // if the trash is disabled.)

</ins><span class="cx" style="display: block; padding: 0 10px">                         $result   = wp_trash_post( $id );

</span><span class="cx" style="display: block; padding: 0 10px">                        $post     = get_post( $id );

</span><span class="cx" style="display: block; padding: 0 10px">                        $response = $this->prepare_item_for_response( $post, $request );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -859,7 +944,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! $result ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_cannot_delete', __( 'The post cannot be deleted.' ), array( 'status' => 500 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_cannot_delete',

+                               __( 'The post cannot be deleted.' ),

+                               array( 'status' => 500 )

+                       );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1064,7 +1153,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                $user_obj = get_userdata( $post_author );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( ! $user_obj ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        return new WP_Error( 'rest_invalid_author', __( 'Invalid author ID.' ), array( 'status' => 400 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 return new WP_Error(

+                                               'rest_invalid_author',

+                                               __( 'Invalid author ID.' ),

+                                               array( 'status' => 400 )

+                                       );

</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">@@ -1077,11 +1170,19 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( '' !== $request['password'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( ! empty( $schema['properties']['sticky'] ) && ! empty( $request['sticky'] ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        return new WP_Error( 'rest_invalid_field', __( 'A post can not be sticky and have a password.' ), array( 'status' => 400 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 return new WP_Error(

+                                               'rest_invalid_field',

+                                               __( 'A post can not be sticky and have a password.' ),

+                                               array( 'status' => 400 )

+                                       );

</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( $prepared_post->ID ) && is_sticky( $prepared_post->ID ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        return new WP_Error( 'rest_invalid_field', __( 'A sticky post can not be password protected.' ), array( 'status' => 400 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 return new WP_Error(

+                                               'rest_invalid_field',

+                                               __( 'A sticky post can not be password protected.' ),

+                                               array( 'status' => 400 )

+                                       );

</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">@@ -1088,7 +1189,11 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! empty( $schema['properties']['sticky'] ) && ! empty( $request['sticky'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! empty( $prepared_post->ID ) && post_password_required( $prepared_post->ID ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                return new WP_Error( 'rest_invalid_field', __( 'A password protected post can not be set to sticky.' ), array( 'status' => 400 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         return new WP_Error(

+                                       'rest_invalid_field',

+                                       __( 'A password protected post can not be set to sticky.' ),

+                                       array( 'status' => 400 )

+                               );

</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">@@ -1098,9 +1203,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                $prepared_post->post_parent = 0;

</span><span class="cx" style="display: block; padding: 0 10px">                        } else {

</span><span class="cx" style="display: block; padding: 0 10px">                                $parent = get_post( (int) $request['parent'] );

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( empty( $parent ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        return new WP_Error( 'rest_post_invalid_id', __( 'Invalid post parent ID.' ), array( 'status' => 400 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 return new WP_Error(

+                                               'rest_post_invalid_id',

+                                               __( 'Invalid post parent ID.' ),

+                                               array( 'status' => 400 )

+                                       );

</ins><span class="cx" style="display: block; padding: 0 10px">                                 }

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $prepared_post->post_parent = (int) $parent->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">@@ -1157,13 +1268,21 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                break;

</span><span class="cx" style="display: block; padding: 0 10px">                        case 'private':

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( ! current_user_can( $post_type->cap->publish_posts ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        return new WP_Error( 'rest_cannot_publish', __( 'Sorry, you are not allowed to create private posts in this post type.' ), array( 'status' => rest_authorization_required_code() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 return new WP_Error(

+                                               'rest_cannot_publish',

+                                               __( 'Sorry, you are not allowed to create private posts in this post type.' ),

+                                               array( 'status' => rest_authorization_required_code() )

+                                       );

</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">                        case 'publish':

</span><span class="cx" style="display: block; padding: 0 10px">                        case 'future':

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( ! current_user_can( $post_type->cap->publish_posts ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        return new WP_Error( 'rest_cannot_publish', __( 'Sorry, you are not allowed to publish posts in this post type.' ), array( 'status' => rest_authorization_required_code() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 return new WP_Error(

+                                               'rest_cannot_publish',

+                                               __( 'Sorry, you are not allowed to publish posts in this post type.' ),

+                                               array( 'status' => rest_authorization_required_code() )

+                                       );

</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">                        default:

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1193,7 +1312,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( $result ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                return true;

</span><span class="cx" style="display: block; padding: 0 10px">                        } else {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                return new WP_Error( 'rest_invalid_featured_media', __( 'Invalid featured media ID.' ), array( 'status' => 400 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         return new WP_Error(

+                                       'rest_invalid_featured_media',

+                                       __( 'Invalid featured media ID.' ),

+                                       array( 'status' => 400 )

+                               );

</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">                        return delete_post_thumbnail( $post_id );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1234,8 +1357,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        return true;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                /* translators: 1: Parameter, 2: List of valid values. */

-               return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s is not one of %2$s.' ), 'template', implode( ', ', array_keys( $allowed_templates ) ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return new WP_Error(

+                       'rest_invalid_param',

+                       /* translators: 1: Parameter, 2: List of valid values. */

+                       sprintf( __( '%1$s is not one of %2$s.' ), 'template', implode( ', ', array_keys( $allowed_templates ) ) )

+               );

</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">@@ -1463,10 +1589,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( rest_is_field_included( 'date_gmt', $fields ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // For drafts, `post_date_gmt` may not be set, indicating that the

-                       // date of the draft should be updated each time it is saved (see

-                       // #38883).  In this case, shim the value based on the `post_date`

-                       // field with the site's timezone offset applied.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 /*

+                        * For drafts, `post_date_gmt` may not be set, indicating that the date

+                        * of the draft should be updated each time it is saved (see #38883).

+                        * In this case, shim the value based on the `post_date` field

+                        * with the site's timezone offset applied.

+                        */

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( '0000-00-00 00:00:00' === $post->post_date_gmt ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $post_date_gmt = get_gmt_from_date( $post->post_date );

</span><span class="cx" style="display: block; padding: 0 10px">                        } else {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1488,10 +1616,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( rest_is_field_included( 'modified_gmt', $fields ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // For drafts, `post_modified_gmt` may not be set (see

-                       // `post_date_gmt` comments above).  In this case, shim the value

-                       // based on the `post_modified` field with the site's timezone

-                       // offset applied.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 /*

+                        * For drafts, `post_modified_gmt` may not be set (see `post_date_gmt` comments

+                        * above). In this case, shim the value based on the `post_modified` field

+                        * with the site's timezone offset applied.

+                        */

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( '0000-00-00 00:00:00' === $post->post_modified_gmt ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $post_modified_gmt = gmdate( 'Y-m-d H:i:s', strtotime( $post->post_modified ) - ( get_option( 'gmt_offset' ) * 3600 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        } else {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2078,8 +2207,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                                'type'        => 'object',

</span><span class="cx" style="display: block; padding: 0 10px">                                                'context'     => array( 'view', 'edit', 'embed' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                                'arg_options' => array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                        'sanitize_callback' => null, // Note: sanitization implemented in self::prepare_item_for_database()

-                                                       'validate_callback' => null, // Note: validation implemented in self::prepare_item_for_database()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 'sanitize_callback' => null, // Note: sanitization implemented in self::prepare_item_for_database().

+                                                       'validate_callback' => null, // Note: validation implemented in self::prepare_item_for_database().

</ins><span class="cx" style="display: block; padding: 0 10px">                                                 ),

</span><span class="cx" style="display: block; padding: 0 10px">                                                'properties'  => array(

</span><span class="cx" style="display: block; padding: 0 10px">                                                        'raw'      => array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2103,8 +2232,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                                'type'        => 'object',

</span><span class="cx" style="display: block; padding: 0 10px">                                                'context'     => array( 'view', 'edit' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                                'arg_options' => array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                        'sanitize_callback' => null, // Note: sanitization implemented in self::prepare_item_for_database()

-                                                       'validate_callback' => null, // Note: validation implemented in self::prepare_item_for_database()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 'sanitize_callback' => null, // Note: sanitization implemented in self::prepare_item_for_database().

+                                                       'validate_callback' => null, // Note: validation implemented in self::prepare_item_for_database().

</ins><span class="cx" style="display: block; padding: 0 10px">                                                 ),

</span><span class="cx" style="display: block; padding: 0 10px">                                                'properties'  => array(

</span><span class="cx" style="display: block; padding: 0 10px">                                                        'raw'           => array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2148,8 +2277,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                                'type'        => 'object',

</span><span class="cx" style="display: block; padding: 0 10px">                                                'context'     => array( 'view', 'edit', 'embed' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                                'arg_options' => array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                        'sanitize_callback' => null, // Note: sanitization implemented in self::prepare_item_for_database()

-                                                       'validate_callback' => null, // Note: validation implemented in self::prepare_item_for_database()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 'sanitize_callback' => null, // Note: sanitization implemented in self::prepare_item_for_database().

+                                                       'validate_callback' => null, // Note: validation implemented in self::prepare_item_for_database().

</ins><span class="cx" style="display: block; padding: 0 10px">                                                 ),

</span><span class="cx" style="display: block; padding: 0 10px">                                                'properties'  => array(

</span><span class="cx" style="display: block; padding: 0 10px">                                                        'raw'       => array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2241,6 +2370,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">                $taxonomies = wp_list_filter( get_object_taxonomies( $this->post_type, 'objects' ), array( 'show_in_rest' => true ) );

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $taxonomies as $taxonomy ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $base = ! empty( $taxonomy->rest_base ) ? $taxonomy->rest_base : $taxonomy->name;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2277,6 +2407,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->schema = $schema;

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 return $this->add_additional_fields_schema( $this->schema );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2622,7 +2753,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function sanitize_post_statuses( $statuses, $request, $parameter ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $statuses = wp_parse_slug_list( $statuses );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // The default status is different in WP_REST_Attachments_Controller

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // The default status is different in WP_REST_Attachments_Controller.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $attributes     = $request->get_attributes();

</span><span class="cx" style="display: block; padding: 0 10px">                $default_status = $attributes['args']['status']['default'];

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2639,7 +2770,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        return $result;

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px">                        } else {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                return new WP_Error( 'rest_forbidden_status', __( 'Status is forbidden.' ), array( 'status' => rest_authorization_required_code() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         return new WP_Error(

+                                       'rest_forbidden_status',

+                                       __( 'Status is forbidden.' ),

+                                       array( 'status' => rest_authorization_required_code() )

+                               );

</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="trunksrcwpincludesrestapiendpointsclasswprestrevisionscontrollerphp"></a>

<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-revisions-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-revisions-controller.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-revisions-controller.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -138,7 +138,11 @@

<span class="cx" style="display: block; padding: 0 10px">         * @return WP_Post|WP_Error Post object if ID is valid, WP_Error otherwise.

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        protected function get_parent( $parent ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $error = new WP_Error( 'rest_post_invalid_parent', __( 'Invalid post parent ID.' ), array( 'status' => 404 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $error = new WP_Error(

+                       'rest_post_invalid_parent',

+                       __( 'Invalid post parent ID.' ),

+                       array( 'status' => 404 )

+               );

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( (int) $parent <= 0 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return $error;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -166,8 +170,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">                $parent_post_type_obj = get_post_type_object( $parent->post_type );

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! current_user_can( $parent_post_type_obj->cap->edit_post, $parent->ID ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_cannot_read', __( 'Sorry, you are not allowed to view revisions of this post.' ), array( 'status' => rest_authorization_required_code() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_cannot_read',

+                               __( 'Sorry, you are not allowed to view revisions of this post.' ),

+                               array( 'status' => rest_authorization_required_code() )

+                       );

</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 true;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -182,7 +191,12 @@

<span class="cx" style="display: block; padding: 0 10px">         * @return WP_Post|WP_Error Revision post object if ID is valid, WP_Error otherwise.

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        protected function get_revision( $id ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $error = new WP_Error( 'rest_post_invalid_id', __( 'Invalid revision ID.' ), array( 'status' => 404 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $error = new WP_Error(

+                       'rest_post_invalid_id',

+                       __( 'Invalid revision ID.' ),

+                       array( 'status' => 404 )

+               );

+

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( (int) $id <= 0 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return $error;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -211,12 +225,20 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Ensure a search string is set in case the orderby is set to 'relevance'.

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! empty( $request['orderby'] ) && 'relevance' === $request['orderby'] && empty( $request['search'] ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_no_search_term_defined', __( 'You need to define a search term to order by relevance.' ), array( 'status' => 400 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_no_search_term_defined',

+                               __( 'You need to define a search term to order by relevance.' ),

+                               array( 'status' => 400 )

+                       );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Ensure an include parameter is set in case the orderby is set to 'include'.

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! empty( $request['orderby'] ) && 'include' === $request['orderby'] && empty( $request['include'] ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_orderby_include_missing_include', __( 'You need to define an include parameter to order by include.' ), array( 'status' => 400 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_orderby_include_missing_include',

+                               __( 'You need to define an include parameter to order by include.' ),

+                               array( 'status' => 400 )

+                       );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( wp_revisions_enabled( $parent ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -281,9 +303,17 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( $total_revisions > 0 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( $offset >= $total_revisions ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        return new WP_Error( 'rest_revision_invalid_offset_number', __( 'The offset number requested is larger than or equal to the number of available revisions.' ), array( 'status' => 400 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 return new WP_Error(

+                                               'rest_revision_invalid_offset_number',

+                                               __( 'The offset number requested is larger than or equal to the number of available revisions.' ),

+                                               array( 'status' => 400 )

+                                       );

</ins><span class="cx" style="display: block; padding: 0 10px">                                 } elseif ( ! $offset && $page > $max_pages ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        return new WP_Error( 'rest_revision_invalid_page_number', __( 'The page number requested is larger than the number of pages available.' ), array( 'status' => 400 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 return new WP_Error(

+                                               'rest_revision_invalid_page_number',

+                                               __( 'The page number requested is larger than the number of pages available.' ),

+                                               array( 'status' => 400 )

+                                       );

</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">                } else {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -294,6 +324,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">                $response = array();

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $revisions as $revision ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $data       = $this->prepare_item_for_response( $revision, $request );

</span><span class="cx" style="display: block; padding: 0 10px">                        $response[] = $this->prepare_response_for_collection( $data );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -354,8 +385,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">                $parent_post_type = get_post_type_object( $parent->post_type );

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! current_user_can( $parent_post_type->cap->delete_post, $parent->ID ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_cannot_delete', __( 'Sorry, you are not allowed to delete revisions of this post.' ), array( 'status' => rest_authorization_required_code() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_cannot_delete',

+                               __( 'Sorry, you are not allowed to delete revisions of this post.' ),

+                               array( 'status' => rest_authorization_required_code() )

+                       );

</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">                $revision = $this->get_revision( $request['id'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -394,7 +430,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $post_type = get_post_type_object( 'revision' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! current_user_can( $post_type->cap->delete_post, $revision->ID ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_cannot_delete', __( 'Sorry, you are not allowed to delete this revision.' ), array( 'status' => rest_authorization_required_code() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_cannot_delete',

+                               __( 'Sorry, you are not allowed to delete this revision.' ),

+                               array( 'status' => rest_authorization_required_code() )

+                       );

</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 true;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -418,8 +458,12 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // We don't support trashing for revisions.

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! $force ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        /* translators: %s: force=true */

-                       return new WP_Error( 'rest_trash_not_supported', sprintf( __( "Revisions do not support trashing. Set '%s' to delete." ), 'force=true' ), array( 'status' => 501 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_trash_not_supported',

+                               /* translators: %s: force=true */

+                               sprintf( __( "Revisions do not support trashing. Set '%s' to delete." ), 'force=true' ),

+                               array( 'status' => 501 )

+                       );

</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">                $previous = $this->prepare_item_for_response( $revision, $request );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -439,7 +483,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                do_action( 'rest_delete_revision', $result, $request );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! $result ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_cannot_delete', __( 'The post cannot be deleted.' ), array( 'status' => 500 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_cannot_delete',

+                               __( 'The post cannot be deleted.' ),

+                               array( 'status' => 500 )

+                       );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $response = new WP_REST_Response();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -701,6 +749,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->schema = $schema;

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 return $this->add_additional_fields_schema( $this->schema );

</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="trunksrcwpincludesrestapiendpointsclasswprestsearchcontrollerphp"></a>

<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-search-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-search-controller.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-search-controller.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -68,9 +68,12 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $search_handlers as $search_handler ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! $search_handler instanceof WP_REST_Search_Handler ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-

-                               /* translators: %s: PHP class name. */

-                               _doing_it_wrong( __METHOD__, sprintf( __( 'REST search handlers must extend the %s class.' ), 'WP_REST_Search_Handler' ), '5.0.0' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         _doing_it_wrong(

+                                       __METHOD__,

+                                       /* translators: %s: PHP class name. */

+                                       sprintf( __( 'REST search handlers must extend the %s class.' ), 'WP_REST_Search_Handler' ),

+                                       '5.0.0'

+                               );

</ins><span class="cx" style="display: block; padding: 0 10px">                                 continue;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -130,12 +133,17 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $result = $handler->search_items( $request );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! isset( $result[ WP_REST_Search_Handler::RESULT_IDS ] ) || ! is_array( $result[ WP_REST_Search_Handler::RESULT_IDS ] ) || ! isset( $result[ WP_REST_Search_Handler::RESULT_TOTAL ] ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_search_handler_error', __( 'Internal search handler error.' ), array( 'status' => 500 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_search_handler_error',

+                               __( 'Internal search handler error.' ),

+                               array( 'status' => 500 )

+                       );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $ids = array_map( 'absint', $result[ WP_REST_Search_Handler::RESULT_IDS ] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $results = array();

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $ids as $id ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $data      = $this->prepare_item_for_response( $id, $request );

</span><span class="cx" style="display: block; padding: 0 10px">                        $results[] = $this->prepare_response_for_collection( $data );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -147,7 +155,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $max_pages = ceil( $total / $per_page );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $page > $max_pages && $total > 0 ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_search_invalid_page_number', __( 'The page number requested is larger than the number of pages available.' ), array( 'status' => 400 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_search_invalid_page_number',

+                               __( 'The page number requested is larger than the number of pages available.' ),

+                               array( 'status' => 400 )

+                       );

</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">                $response = rest_ensure_response( $results );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -217,6 +229,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $types    = array();

</span><span class="cx" style="display: block; padding: 0 10px">                $subtypes = array();

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $this->search_handlers as $search_handler ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $types[]  = $search_handler->get_type();

</span><span class="cx" style="display: block; padding: 0 10px">                        $subtypes = array_merge( $subtypes, $search_handler->get_subtypes() );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -267,6 +280,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->schema = $schema;

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 return $this->add_additional_fields_schema( $this->schema );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -280,6 +294,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function get_collection_params() {

</span><span class="cx" style="display: block; padding: 0 10px">                $types    = array();

</span><span class="cx" style="display: block; padding: 0 10px">                $subtypes = array();

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $this->search_handlers as $search_handler ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $types[]  = $search_handler->get_type();

</span><span class="cx" style="display: block; padding: 0 10px">                        $subtypes = array_merge( $subtypes, $search_handler->get_subtypes() );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -356,7 +371,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $type = $request->get_param( self::PROP_TYPE );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! $type || ! isset( $this->search_handlers[ $type ] ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_search_invalid_type', __( 'Invalid type parameter.' ), array( 'status' => 400 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_search_invalid_type',

+                               __( 'Invalid type parameter.' ),

+                               array( 'status' => 400 )

+                       );

</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 $this->search_handlers[ $type ];

</span></span></pre></div>

<a id="trunksrcwpincludesrestapiendpointsclasswprestsettingscontrollerphp"></a>

<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-settings-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-settings-controller.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-settings-controller.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -131,6 +131,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                if ( is_wp_error( rest_validate_value_from_schema( $value, $schema ) ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return null;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 return rest_sanitize_value_from_schema( $value, $schema );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -294,6 +295,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->schema = $schema;

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 return $this->add_additional_fields_schema( $this->schema );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -315,6 +317,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                if ( is_null( $value ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return $value;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 return rest_parse_request_arg( $value, $request, $param );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -336,6 +339,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                foreach ( $schema['properties'] as $key => $child_schema ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        $schema['properties'][ $key ] = $this->set_additional_properties_to_false( $child_schema );

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $schema['additionalProperties'] = false;

</span><span class="cx" style="display: block; padding: 0 10px">                                break;

</span><span class="cx" style="display: block; padding: 0 10px">                        case 'array':

</span></span></pre></div>

<a id="trunksrcwpincludesrestapiendpointsclasswpresttaxonomiescontrollerphp"></a>

<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-taxonomies-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-taxonomies-controller.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-taxonomies-controller.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -87,13 +87,20 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        } else {

</span><span class="cx" style="display: block; padding: 0 10px">                                $taxonomies = get_taxonomies( '', 'objects' );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                         foreach ( $taxonomies as $taxonomy ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( ! empty( $taxonomy->show_in_rest ) && current_user_can( $taxonomy->cap->assign_terms ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        return true;

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_cannot_view', __( 'Sorry, you are not allowed to manage terms in this taxonomy.' ), array( 'status' => rest_authorization_required_code() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

+                       return new WP_Error(

+                               'rest_cannot_view',

+                               __( 'Sorry, you are not allowed to manage terms in this taxonomy.' ),

+                               array( 'status' => rest_authorization_required_code() )

+                       );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 return true;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,11 +122,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">                } else {

</span><span class="cx" style="display: block; padding: 0 10px">                        $taxonomies = get_taxonomies( '', 'objects' );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 $data = array();

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $taxonomies as $tax_type => $value ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( empty( $value->show_in_rest ) || ( 'edit' === $request['context'] && ! current_user_can( $value->cap->assign_terms ) ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                continue;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                         $tax               = $this->prepare_item_for_response( $value, $request );

</span><span class="cx" style="display: block; padding: 0 10px">                        $tax               = $this->prepare_response_for_collection( $tax );

</span><span class="cx" style="display: block; padding: 0 10px">                        $data[ $tax_type ] = $tax;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -149,8 +159,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( empty( $tax_obj->show_in_rest ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                return false;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( 'edit' === $request['context'] && ! current_user_can( $tax_obj->cap->assign_terms ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                return new WP_Error( 'rest_forbidden_context', __( 'Sorry, you are not allowed to manage terms in this taxonomy.' ), array( 'status' => rest_authorization_required_code() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         return new WP_Error(

+                                       'rest_forbidden_context',

+                                       __( 'Sorry, you are not allowed to manage terms in this taxonomy.' ),

+                                       array( 'status' => rest_authorization_required_code() )

+                               );

</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">@@ -167,10 +182,17 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</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">                $tax_obj = get_taxonomy( $request['taxonomy'] );

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( empty( $tax_obj ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_taxonomy_invalid', __( 'Invalid taxonomy.' ), array( 'status' => 404 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_taxonomy_invalid',

+                               __( 'Invalid taxonomy.' ),

+                               array( 'status' => 404 )

+                       );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 $data = $this->prepare_item_for_response( $tax_obj, $request );

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 return rest_ensure_response( $data );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -379,6 +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">                $this->schema = $schema;

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 return $this->add_additional_fields_schema( $this->schema );

</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="trunksrcwpincludesrestapiendpointsclasswpresttermscontrollerphp"></a>

<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-terms-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-terms-controller.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -144,12 +144,19 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function get_items_permissions_check( $request ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $tax_obj = get_taxonomy( $this->taxonomy );

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! $tax_obj || ! $this->check_is_taxonomy_allowed( $this->taxonomy ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return false;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( 'edit' === $request['context'] && ! current_user_can( $tax_obj->cap->edit_terms ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_forbidden_context', __( 'Sorry, you are not allowed to edit terms in this taxonomy.' ), array( 'status' => rest_authorization_required_code() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_forbidden_context',

+                               __( 'Sorry, you are not allowed to edit terms in this taxonomy.' ),

+                               array( 'status' => rest_authorization_required_code() )

+                       );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 return true;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -258,7 +265,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $total_terms = wp_count_terms( $this->taxonomy, $count_args );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // wp_count_terms can return a falsy value when the term has no children.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // wp_count_terms() can return a falsy value when the term has no children.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! $total_terms ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $total_terms = 0;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -312,7 +319,11 @@

<span class="cx" style="display: block; padding: 0 10px">         * @return WP_Term|WP_Error Term object if ID is valid, WP_Error otherwise.

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        protected function get_term( $id ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $error = new WP_Error( 'rest_term_invalid', __( 'Term does not exist.' ), array( 'status' => 404 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $error = new WP_Error(

+                       'rest_term_invalid',

+                       __( 'Term does not exist.' ),

+                       array( 'status' => 404 )

+               );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! $this->check_is_taxonomy_allowed( $this->taxonomy ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return $error;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -340,13 +351,19 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</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">                $term = $this->get_term( $request['id'] );

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( is_wp_error( $term ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return $term;

</span><span class="cx" style="display: 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 ( 'edit' === $request['context'] && ! current_user_can( 'edit_term', $term->term_id ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_forbidden_context', __( 'Sorry, you are not allowed to edit this term.' ), array( 'status' => rest_authorization_required_code() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_forbidden_context',

+                               __( 'Sorry, you are not allowed to edit this term.' ),

+                               array( 'status' => rest_authorization_required_code() )

+                       );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 return true;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -384,11 +401,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">                $taxonomy_obj = get_taxonomy( $this->taxonomy );

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ( is_taxonomy_hierarchical( $this->taxonomy )

</span><span class="cx" style="display: block; padding: 0 10px">                                && ! current_user_can( $taxonomy_obj->cap->edit_terms ) )

</span><span class="cx" style="display: block; padding: 0 10px">                        || ( ! is_taxonomy_hierarchical( $this->taxonomy )

</span><span class="cx" style="display: block; padding: 0 10px">                                && ! current_user_can( $taxonomy_obj->cap->assign_terms ) ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_cannot_create', __( 'Sorry, you are not allowed to create new terms.' ), array( 'status' => rest_authorization_required_code() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_cannot_create',

+                               __( 'Sorry, you are not allowed to create new terms.' ),

+                               array( 'status' => rest_authorization_required_code() )

+                       );

</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 true;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -405,13 +427,21 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function create_item( $request ) {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( isset( $request['parent'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! is_taxonomy_hierarchical( $this->taxonomy ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                return new WP_Error( 'rest_taxonomy_not_hierarchical', __( 'Cannot set parent term, taxonomy is not hierarchical.' ), array( 'status' => 400 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         return new WP_Error(

+                                       'rest_taxonomy_not_hierarchical',

+                                       __( 'Cannot set parent term, taxonomy is not hierarchical.' ),

+                                       array( 'status' => 400 )

+                               );

</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">                        $parent = get_term( (int) $request['parent'], $this->taxonomy );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! $parent ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                return new WP_Error( 'rest_term_invalid', __( 'Parent term does not exist.' ), array( 'status' => 400 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         return new WP_Error(

+                                       'rest_term_invalid',

+                                       __( 'Parent term does not exist.' ),

+                                       array( 'status' => 400 )

+                               );

</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">@@ -502,12 +532,17 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function update_item_permissions_check( $request ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $term = $this->get_term( $request['id'] );

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( is_wp_error( $term ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return $term;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! current_user_can( 'edit_term', $term->term_id ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_cannot_update', __( 'Sorry, you are not allowed to edit this term.' ), array( 'status' => rest_authorization_required_code() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_cannot_update',

+                               __( 'Sorry, you are not allowed to edit this term.' ),

+                               array( 'status' => rest_authorization_required_code() )

+                       );

</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 true;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -529,13 +564,21 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( isset( $request['parent'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! is_taxonomy_hierarchical( $this->taxonomy ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                return new WP_Error( 'rest_taxonomy_not_hierarchical', __( 'Cannot set parent term, taxonomy is not hierarchical.' ), array( 'status' => 400 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         return new WP_Error(

+                                       'rest_taxonomy_not_hierarchical',

+                                       __( 'Cannot set parent term, taxonomy is not hierarchical.' ),

+                                       array( 'status' => 400 )

+                               );

</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">                        $parent = get_term( (int) $request['parent'], $this->taxonomy );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! $parent ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                return new WP_Error( 'rest_term_invalid', __( 'Parent term does not exist.' ), array( 'status' => 400 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         return new WP_Error(

+                                       'rest_term_invalid',

+                                       __( 'Parent term does not exist.' ),

+                                       array( 'status' => 400 )

+                               );

</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">@@ -590,12 +633,17 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function delete_item_permissions_check( $request ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $term = $this->get_term( $request['id'] );

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( is_wp_error( $term ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return $term;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! current_user_can( 'delete_term', $term->term_id ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_cannot_delete', __( 'Sorry, you are not allowed to delete this term.' ), array( 'status' => rest_authorization_required_code() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_cannot_delete',

+                               __( 'Sorry, you are not allowed to delete this term.' ),

+                               array( 'status' => rest_authorization_required_code() )

+                       );

</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 true;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -619,8 +667,12 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // We don't support trashing for terms.

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! $force ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        /* translators: %s: force=true */

-                       return new WP_Error( 'rest_trash_not_supported', sprintf( __( "Terms do not support trashing. Set '%s' to delete." ), 'force=true' ), array( 'status' => 501 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_trash_not_supported',

+                               /* translators: %s: force=true */

+                               sprintf( __( "Terms do not support trashing. Set '%s' to delete." ), 'force=true' ),

+                               array( 'status' => 501 )

+                       );

</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">                $request->set_param( 'context', 'view' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -630,7 +682,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $retval = wp_delete_term( $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">                if ( ! $retval ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_cannot_delete', __( 'The term cannot be deleted.' ), array( 'status' => 500 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_cannot_delete',

+                               __( 'The term cannot be deleted.' ),

+                               array( 'status' => 500 )

+                       );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $response = new WP_REST_Response();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -929,6 +985,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $schema['properties']['meta'] = $this->meta->get_field_schema();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->schema = $schema;

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 return $this->add_additional_fields_schema( $this->schema );

</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="trunksrcwpincludesrestapiendpointsclasswprestthemescontrollerphp"></a>

<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-themes-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-themes-controller.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-themes-controller.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -59,7 +59,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function get_items_permissions_check( $request ) {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! is_user_logged_in() || ! current_user_can( 'edit_posts' ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_user_cannot_view', __( 'Sorry, you are not allowed to view themes.' ), array( 'status' => rest_authorization_required_code() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_user_cannot_view',

+                               __( 'Sorry, you are not allowed to view themes.' ),

+                               array( 'status' => rest_authorization_required_code() )

+                       );

</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 true;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -182,6 +186,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->schema = $schema;

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 return $this->add_additional_fields_schema( $this->schema );

</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="trunksrcwpincludesrestapiendpointsclasswprestuserscontrollerphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -173,7 +173,11 @@

</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">-                return new WP_Error( 'rest_invalid_param', __( 'Invalid user parameter(s).' ), array( 'status' => 400 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return new WP_Error(

+                       'rest_invalid_param',

+                       __( 'Invalid user parameter(s).' ),

+                       array( 'status' => 400 )

+               );

</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">@@ -187,15 +191,27 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function get_items_permissions_check( $request ) {

<span class="cx" style="display: block; padding: 0 10px">                // Check if roles is specified in GET request and if user can list users.

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! empty( $request['roles'] ) && ! current_user_can( 'list_users' ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_user_cannot_view', __( 'Sorry, you are not allowed to filter users by role.' ), array( 'status' => rest_authorization_required_code() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_user_cannot_view',

+                               __( 'Sorry, you are not allowed to filter users by role.' ),

+                               array( 'status' => rest_authorization_required_code() )

+                       );

</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 ( 'edit' === $request['context'] && ! current_user_can( 'list_users' ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_forbidden_context', __( 'Sorry, you are not allowed to list users.' ), array( 'status' => rest_authorization_required_code() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_forbidden_context',

+                               __( 'Sorry, you are not allowed to list users.' ),

+                               array( 'status' => rest_authorization_required_code() )

+                       );

</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 ( in_array( $request['orderby'], array( 'email', 'registered_date' ), true ) && ! current_user_can( 'list_users' ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_forbidden_orderby', __( 'Sorry, you are not allowed to order users by this parameter.' ), array( 'status' => rest_authorization_required_code() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_forbidden_orderby',

+                               __( 'Sorry, you are not allowed to order users by this parameter.' ),

+                               array( 'status' => rest_authorization_required_code() )

+                       );

</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 ( 'authors' === $request['who'] ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -208,7 +224,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_forbidden_who', __( 'Sorry, you are not allowed to query users by this parameter.' ), array( 'status' => rest_authorization_required_code() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_forbidden_who',

+                               __( 'Sorry, you are not allowed to query users by this parameter.' ),

+                               array( 'status' => rest_authorization_required_code() )

+                       );

</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 true;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -358,7 +378,12 @@

<span class="cx" style="display: block; padding: 0 10px">         * @return WP_User|WP_Error True if ID is valid, WP_Error otherwise.

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        protected function get_user( $id ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $error = new WP_Error( 'rest_user_invalid_id', __( 'Invalid user ID.' ), array( 'status' => 404 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $error = new WP_Error(

+                       'rest_user_invalid_id',

+                       __( 'Invalid user ID.' ),

+                       array( 'status' => 404 )

+               );

+

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( (int) $id <= 0 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return $error;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -396,9 +421,17 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( 'edit' === $request['context'] && ! current_user_can( 'list_users' ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_user_cannot_view', __( 'Sorry, you are not allowed to list users.' ), array( 'status' => rest_authorization_required_code() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_user_cannot_view',

+                               __( 'Sorry, you are not allowed to list users.' ),

+                               array( 'status' => rest_authorization_required_code() )

+                       );

</ins><span class="cx" style="display: block; padding: 0 10px">                 } elseif ( ! count_user_posts( $user->ID, $types ) && ! current_user_can( 'edit_user', $user->ID ) && ! current_user_can( 'list_users' ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_user_cannot_view', __( 'Sorry, you are not allowed to list users.' ), array( 'status' => rest_authorization_required_code() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_user_cannot_view',

+                               __( 'Sorry, you are not allowed to list users.' ),

+                               array( 'status' => rest_authorization_required_code() )

+                       );

</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 true;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -436,7 +469,11 @@

</span><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"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( empty( $current_user_id ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_not_logged_in', __( 'You are not currently logged in.' ), array( 'status' => 401 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_not_logged_in',

+                               __( 'You are not currently logged in.' ),

+                               array( 'status' => 401 )

+                       );

</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">                $user     = wp_get_current_user();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -457,7 +494,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function create_item_permissions_check( $request ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! current_user_can( 'create_users' ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_cannot_create_user', __( 'Sorry, you are not allowed to create new users.' ), array( 'status' => rest_authorization_required_code() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_cannot_create_user',

+                               __( 'Sorry, you are not allowed to create new users.' ),

+                               array( 'status' => rest_authorization_required_code() )

+                       );

</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 true;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -473,7 +514,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function create_item( $request ) {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! empty( $request['id'] ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_user_exists', __( 'Cannot create existing user.' ), array( 'status' => 400 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_user_exists',

+                               __( 'Cannot create existing user.' ),

+                               array( 'status' => 400 )

+                       );

</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">                $schema = $this->get_item_schema();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -492,12 +537,19 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $ret = wpmu_validate_user_signup( $user->user_login, $user->user_email );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( is_wp_error( $ret['errors'] ) && $ret['errors']->has_errors() ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $error = new WP_Error( 'rest_invalid_param', __( 'Invalid user parameter(s).' ), array( 'status' => 400 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $error = new WP_Error(

+                                       'rest_invalid_param',

+                                       __( 'Invalid user parameter(s).' ),

+                                       array( 'status' => 400 )

+                               );

+

</ins><span class="cx" style="display: block; padding: 0 10px">                                 foreach ( $ret['errors']->errors as $code => $messages ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        foreach ( $messages as $message ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                $error->add( $code, $message );

</span><span class="cx" style="display: block; padding: 0 10px">                                        }

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                                         $error_data = $error->get_error_data( $code );

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                                         if ( $error_data ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                $error->add_data( $error_data, $code );

</span><span class="cx" style="display: block; padding: 0 10px">                                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -510,7 +562,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $user_id = wpmu_create_user( $user->user_login, $user->user_pass, $user->user_email );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! $user_id ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                return new WP_Error( 'rest_user_create', __( 'Error creating new user.' ), array( 'status' => 500 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         return new WP_Error(

+                                       'rest_user_create',

+                                       __( 'Error creating new user.' ),

+                                       array( 'status' => 500 )

+                               );

</ins><span class="cx" style="display: block; padding: 0 10px">                         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $user->ID = $user_id;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -602,7 +658,11 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! empty( $request['roles'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! current_user_can( 'promote_user', $user->ID ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                return new WP_Error( 'rest_cannot_edit_roles', __( 'Sorry, you are not allowed to edit roles of this user.' ), array( 'status' => rest_authorization_required_code() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         return new WP_Error(

+                                       'rest_cannot_edit_roles',

+                                       __( 'Sorry, you are not allowed to edit roles of this user.' ),

+                                       array( 'status' => rest_authorization_required_code() )

+                               );

</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">                        $request_params = array_keys( $request->get_params() );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -615,7 +675,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! current_user_can( 'edit_user', $user->ID ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_cannot_edit', __( 'Sorry, you are not allowed to edit this user.' ), array( 'status' => rest_authorization_required_code() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_cannot_edit',

+                               __( 'Sorry, you are not allowed to edit this user.' ),

+                               array( 'status' => rest_authorization_required_code() )

+                       );

</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 true;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -638,21 +702,37 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $id = $user->ID;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! $user ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_user_invalid_id', __( 'Invalid user ID.' ), array( 'status' => 404 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_user_invalid_id',

+                               __( 'Invalid user ID.' ),

+                               array( 'status' => 404 )

+                       );

</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">                $owner_id = email_exists( $request['email'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $owner_id && $owner_id !== $id ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_user_invalid_email', __( 'Invalid email address.' ), array( 'status' => 400 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_user_invalid_email',

+                               __( 'Invalid email address.' ),

+                               array( 'status' => 400 )

+                       );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! empty( $request['username'] ) && $request['username'] !== $user->user_login ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_user_invalid_argument', __( "Username isn't editable." ), array( 'status' => 400 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_user_invalid_argument',

+                               __( "Username isn't editable." ),

+                               array( 'status' => 400 )

+                       );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! empty( $request['slug'] ) && $request['slug'] !== $user->user_nicename && get_user_by( 'slug', $request['slug'] ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_user_invalid_slug', __( 'Invalid slug.' ), array( 'status' => 400 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_user_invalid_slug',

+                               __( 'Invalid slug.' ),

+                               array( 'status' => 400 )

+                       );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! empty( $request['roles'] ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -754,7 +834,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! current_user_can( 'delete_user', $user->ID ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_user_cannot_delete', __( 'Sorry, you are not allowed to delete this user.' ), array( 'status' => rest_authorization_required_code() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_user_cannot_delete',

+                               __( 'Sorry, you are not allowed to delete this user.' ),

+                               array( 'status' => rest_authorization_required_code() )

+                       );

</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 true;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -771,9 +855,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function delete_item( $request ) {

<span class="cx" style="display: block; padding: 0 10px">                // We don't support delete requests in multisite.

</span><span class="cx" style="display: block; padding: 0 10px">                if ( is_multisite() ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_cannot_delete', __( 'The user cannot be deleted.' ), array( 'status' => 501 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_cannot_delete',

+                               __( 'The user cannot be deleted.' ),

+                               array( 'status' => 501 )

+                       );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 $user = $this->get_user( $request['id'] );

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( is_wp_error( $user ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return $user;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -784,13 +874,21 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // We don't support trashing for users.

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! $force ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        /* translators: %s: force=true */

-                       return new WP_Error( 'rest_trash_not_supported', sprintf( __( "Users do not support trashing. Set '%s' to delete." ), 'force=true' ), array( 'status' => 501 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_trash_not_supported',

+                               /* translators: %s: force=true */

+                               sprintf( __( "Users do not support trashing. Set '%s' to delete." ), 'force=true' ),

+                               array( 'status' => 501 )

+                       );

</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( $reassign ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( $reassign === $id || ! get_userdata( $reassign ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                return new WP_Error( 'rest_user_invalid_reassign', __( 'Invalid user ID for reassignment.' ), array( 'status' => 400 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         return new WP_Error(

+                                       'rest_user_invalid_reassign',

+                                       __( 'Invalid user ID for reassignment.' ),

+                                       array( 'status' => 400 )

+                               );

</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">@@ -804,7 +902,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $result = wp_delete_user( $id, $reassign );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! $result ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_cannot_delete', __( 'The user cannot be deleted.' ), array( 'status' => 500 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_cannot_delete',

+                               __( 'The user cannot be deleted.' ),

+                               array( 'status' => 500 )

+                       );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $response = new WP_REST_Response();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1000,7 +1102,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $schema = $this->get_item_schema();

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // required arguments.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Required arguments.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( isset( $request['email'] ) && ! empty( $schema['properties']['email'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $prepared_user->user_email = $request['email'];

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1013,7 +1115,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $prepared_user->user_pass = $request['password'];

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // optional arguments.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Optional arguments.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( isset( $request['id'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $prepared_user->ID = absint( $request['id'] );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1050,7 +1152,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $prepared_user->locale = $request['locale'];

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // setting roles will be handled outside of this function.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Setting roles will be handled outside of this function.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( isset( $request['roles'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $prepared_user->role = false;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1082,8 +1184,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $roles as $role ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! isset( $wp_roles->role_objects[ $role ] ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                /* translators: %s: Role key. */

-                               return new WP_Error( 'rest_user_invalid_role', sprintf( __( 'The role %s does not exist.' ), $role ), array( 'status' => 400 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         return new WP_Error(

+                                       'rest_user_invalid_role',

+                                       /* translators: %s: Role key. */

+                                       sprintf( __( 'The role %s does not exist.' ), $role ),

+                                       array( 'status' => 400 )

+                               );

</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">                        $potential_role = $wp_roles->role_objects[ $role ];

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1097,7 +1203,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                && get_current_user_id() === $user_id

</span><span class="cx" style="display: block; padding: 0 10px">                                && ! $potential_role->has_cap( 'edit_users' )

</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 new WP_Error( 'rest_user_invalid_role', __( 'Sorry, you are not allowed to give users that role.' ), array( 'status' => rest_authorization_required_code() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         return new WP_Error(

+                                       'rest_user_invalid_role',

+                                       __( 'Sorry, you are not allowed to give users that role.' ),

+                                       array( 'status' => rest_authorization_required_code() )

+                               );

</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">                        /** Include admin functions to get access to get_editable_roles() */

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1107,7 +1217,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $editable_roles = get_editable_roles();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( empty( $editable_roles[ $role ] ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                return new WP_Error( 'rest_user_invalid_role', __( 'Sorry, you are not allowed to give users that role.' ), array( 'status' => 403 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         return new WP_Error(

+                                       'rest_user_invalid_role',

+                                       __( 'Sorry, you are not allowed to give users that role.' ),

+                                       array( 'status' => 403 )

+                               );

</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">@@ -1130,7 +1244,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $username = (string) $value;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! validate_username( $username ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_user_invalid_username', __( 'Username contains invalid characters.' ), array( 'status' => 400 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_user_invalid_username',

+                               __( 'Username contains invalid characters.' ),

+                               array( 'status' => 400 )

+                       );

</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 filter is documented in wp-includes/user.php */

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1137,7 +1255,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $illegal_logins = (array) apply_filters( 'illegal_user_logins', array() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( in_array( strtolower( $username ), array_map( 'strtolower', $illegal_logins ), true ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_user_invalid_username', __( 'Sorry, that username is not allowed.' ), array( 'status' => 400 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_user_invalid_username',

+                               __( 'Sorry, that username is not allowed.' ),

+                               array( 'status' => 400 )

+                       );

</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 $username;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1159,11 +1281,19 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $password = (string) $value;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( empty( $password ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_user_invalid_password', __( 'Passwords cannot be empty.' ), array( 'status' => 400 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_user_invalid_password',

+                               __( 'Passwords cannot be empty.' ),

+                               array( 'status' => 400 )

+                       );

</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 ( false !== strpos( $password, '\\' ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return new WP_Error( 'rest_user_invalid_password', __( 'Passwords cannot contain the "\\" character.' ), array( 'status' => 400 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return new WP_Error(

+                               'rest_user_invalid_password',

+                               __( 'Passwords cannot contain the "\\" character.' ),

+                               array( 'status' => 400 )

+                       );

</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 $password;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1338,6 +1468,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $schema['properties']['meta'] = $this->meta->get_field_schema();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->schema = $schema;

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 return $this->add_additional_fields_schema( $this->schema );

</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="trunksrcwpincludesrestapifieldsclasswprestmetafieldsphp"></a>

<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/fields/class-wp-rest-meta-fields.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rest-api/fields/class-wp-rest-meta-fields.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/rest-api/fields/class-wp-rest-meta-fields.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -79,6 +79,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $fields as $meta_key => $args ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $name       = $args['name'];

</span><span class="cx" style="display: block; padding: 0 10px">                        $all_values = get_metadata( $this->get_meta_type(), $object_id, $meta_key, false );

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( $args['single'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( empty( $all_values ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        $value = $args['schema']['default'];

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -85,9 +86,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                } else {

</span><span class="cx" style="display: block; padding: 0 10px">                                        $value = $all_values[0];

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $value = $this->prepare_value_for_response( $value, $request, $args );

</span><span class="cx" style="display: block; padding: 0 10px">                        } else {

</span><span class="cx" style="display: block; padding: 0 10px">                                $value = array();

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                                 foreach ( $all_values as $row ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        $value[] = $this->prepare_value_for_response( $row, $request, $args );

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -132,6 +135,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function update_value( $meta, $object_id ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $fields = $this->get_registered_fields();

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $fields as $meta_key => $args ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $name = $args['name'];

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! array_key_exists( $name, $meta ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -210,6 +214,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        protected function delete_meta_value( $object_id, $meta_key, $name ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $meta_type = $this->get_meta_type();

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! current_user_can( "delete_{$meta_type}_meta", $object_id, $meta_key ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return new WP_Error(

</span><span class="cx" style="display: block; padding: 0 10px">                                'rest_cannot_delete',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -251,6 +256,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        protected function update_multi_meta_value( $object_id, $meta_key, $name, $values ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $meta_type = $this->get_meta_type();

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! current_user_can( "edit_{$meta_type}_meta", $object_id, $meta_key ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return new WP_Error(

</span><span class="cx" style="display: block; padding: 0 10px">                                'rest_cannot_update',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -286,9 +292,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        unset( $to_add[ $add_key ] );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // `delete_metadata` removes _all_ instances of the value, so only call once. Otherwise,

-               // `delete_metadata` will return false for subsequent calls of the same value.

-               // Use serialization to produce a predictable string that can be used by array_unique.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /*

+                * `delete_metadata` removes _all_ instances of the value, so only call once. Otherwise,

+                * `delete_metadata` will return false for subsequent calls of the same value.

+                * Use serialization to produce a predictable string that can be used by array_unique.

+                */

</ins><span class="cx" style="display: block; padding: 0 10px">                 $to_remove = array_map( 'maybe_unserialize', array_unique( array_map( 'maybe_serialize', $to_remove ) ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $to_remove as $value ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -335,6 +343,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        protected function update_meta_value( $object_id, $meta_key, $name, $value ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $meta_type = $this->get_meta_type();

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! current_user_can( "edit_{$meta_type}_meta", $object_id, $meta_key ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return new WP_Error(

</span><span class="cx" style="display: block; padding: 0 10px">                                'rest_cannot_update',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -494,7 +503,6 @@

<span class="cx" style="display: block; padding: 0 10px">         * @return mixed Value prepared for output. If a non-JsonSerializable object, null.

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public static function prepare_value( $value, $request, $args ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-

</del><span class="cx" style="display: block; padding: 0 10px">                 if ( $args['single'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $schema = $args['schema'];

</span><span class="cx" style="display: block; padding: 0 10px">                } else {

</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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/rest-api.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,6 +73,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                'callback' => null,

</span><span class="cx" style="display: block; padding: 0 10px">                'args'     => array(),

</span><span class="cx" style="display: block; padding: 0 10px">        );

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">         foreach ( $args as $key => &$arg_group ) {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! is_numeric( $key ) ) {

<span class="cx" style="display: block; padding: 0 10px">                        // Route option, skip here.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -360,7 +361,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $url .= $path;

</span><span class="cx" style="display: block; padding: 0 10px">        } else {

</span><span class="cx" style="display: block; padding: 0 10px">                $url = trailingslashit( get_home_url( $blog_id, '', $scheme ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // nginx only allows HTTP/1.0 methods when redirecting from / to /index.php

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // nginx only allows HTTP/1.0 methods when redirecting from / to /index.php.

</ins><span class="cx" style="display: block; padding: 0 10px">                 // To work around this, we manually add index.php to the URL, avoiding the redirect.

</span><span class="cx" style="display: block; padding: 0 10px">                if ( 'index.php' !== substr( $url, 9 ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $url .= 'index.php';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -377,10 +378,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( is_admin() && force_ssl_admin() ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // In this situation the home URL may be http:, and `is_ssl()` may be

-               // false, but the admin is served over https: (one way or another), so

-               // REST API usage will be blocked by browsers unless it is also served

-               // over HTTPS.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /*

+                * In this situation the home URL may be http:, and `is_ssl()` may be false,

+                * but the admin is served over https: (one way or another), so REST API usage

+                * will be blocked by browsers unless it is also served over HTTPS.

+                */

</ins><span class="cx" style="display: block; padding: 0 10px">                 $url = set_url_scheme( $url, 'https' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -581,7 +583,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $origin = get_http_origin();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( $origin ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Requests from file:// and data: URLs send "Origin: null"

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Requests from file:// and data: URLs send "Origin: null".

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( 'null' !== $origin ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $origin = esc_url_raw( $origin );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -632,7 +634,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $endpoints as $endpoint ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Remove the redundant preg_match argument.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Remove the redundant preg_match() argument.

</ins><span class="cx" style="display: block; padding: 0 10px">                         unset( $args[0] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $request->set_url_params( $args );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -791,6 +793,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        if ( in_array( $field, $fields, true ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                return true;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">         foreach ( $fields as $accepted_field ) {

<span class="cx" style="display: block; padding: 0 10px">                // Check to see if $field is the parent of any item in $fields.

<span class="cx" style="display: block; padding: 0 10px">                // A field "parent" should be accepted if "parent.child" is accepted.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -797,12 +800,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                if ( strpos( $accepted_field, "$field." ) === 0 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return true;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Conversely, if "parent" is accepted, all "parent.child" fields should

-               // also be accepted.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Conversely, if "parent" is accepted, all "parent.child" fields

+               // should also be accepted.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( strpos( $field, "$accepted_field." ) === 0 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return true;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">         return 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">@@ -979,9 +983,11 @@

<span class="cx" style="display: block; padding: 0 10px">  *                    null on failure.

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function rest_get_date_with_gmt( $date, $is_utc = false ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Whether or not the original date actually has a timezone string

-       // changes the way we need to do timezone conversion.  Store this info

-       // before parsing the date, and use it later.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*

+        * Whether or not the original date actually has a timezone string

+        * changes the way we need to do timezone conversion.

+        * Store this info before parsing the date, and use it later.

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         $has_timezone = preg_match( '#(Z|[+-]\d{2}(:\d{2})?)$#', $date );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $date = rest_parse_date( $date );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -990,10 +996,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                return null;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // At this point $date could either be a local date (if we were passed a

-       // *local* date without a timezone offset) or a UTC date (otherwise).

-       // Timezone conversion needs to be handled differently between these two

-       // cases.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*

+        * At this point $date could either be a local date (if we were passed

+        * a *local* date without a timezone offset) or a UTC date (otherwise).

+        * Timezone conversion needs to be handled differently between these two cases.

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! $is_utc && ! $has_timezone ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $local = gmdate( 'Y-m-d H:i:s', $date );

</span><span class="cx" style="display: block; padding: 0 10px">                $utc   = get_gmt_from_date( $local );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1228,10 +1235,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! is_null( $value ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $value = wp_parse_list( $value );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! wp_is_numeric_array( $value ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        /* translators: 1: Parameter, 2: Type name. */

</span><span class="cx" style="display: block; padding: 0 10px">                        return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s is not of type %2$s.' ), $param, 'array' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $value as $index => $v ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $is_valid = rest_validate_value_from_schema( $v, $args['items'], $param . '[' . $index . ']' );

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( is_wp_error( $is_valid ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1390,7 +1399,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function rest_sanitize_value_from_schema( $value, $args ) {

</span><span class="cx" style="display: block; padding: 0 10px">        if ( is_array( $args['type'] ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Determine which type the value was validated against, and use that type when performing sanitization

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Determine which type the value was validated against,

+               // and use that type when performing sanitization.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $validated_type = '';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $args['type'] as $type ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1414,12 +1424,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                if ( empty( $args['items'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return (array) $value;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 $value = wp_parse_list( $value );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $value as $index => $v ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $value[ $index ] = rest_sanitize_value_from_schema( $v, $args['items'] );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Normalize to numeric array so nothing unexpected

-               // is in the keys.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

+               // Normalize to numeric array so nothing unexpected is in the keys.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $value = array_values( $value );

</span><span class="cx" style="display: block; padding: 0 10px">                return $value;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1474,9 +1485,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                return sanitize_text_field( $value );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        case 'email':

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                /*

-                                * sanitize_email() validates, which would be unexpected.

-                                */

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // sanitize_email() validates, which would be unexpected.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 return sanitize_text_field( $value );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        case 'uri':

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1505,7 +1514,8 @@

<span class="cx" style="display: block; padding: 0 10px">  * @return array        Modified reduce accumulator.

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function rest_preload_api_request( $memo, $path ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // array_reduce() doesn't support passing an array in PHP 5.2, so we need to make sure we start with one.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // array_reduce() doesn't support passing an array in PHP 5.2,

+       // so we need to make sure we start with one.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! is_array( $memo ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $memo = array();

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span></span></pre></div>

<a id="trunksrcwpincludesrevisionphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/revision.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/revision.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/revision.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,7 +29,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( is_null( $fields ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Allow these to be versioned

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Allow these to be versioned.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $fields = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'post_title'   => __( 'Title' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        'post_content' => __( 'Content' ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -55,7 +55,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        $fields = apply_filters( '_wp_post_revision_fields', $fields, $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">-        // WP uses these internally either in versioning or elsewhere - they cannot be versioned

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // WP uses these internally either in versioning or elsewhere - they cannot be versioned.

</ins><span class="cx" style="display: block; padding: 0 10px">         foreach ( array( 'ID', 'post_name', 'post_parent', 'post_date', 'post_date_gmt', 'post_status', 'post_type', 'comment_count', 'post_author' ) as $protect ) {

</span><span class="cx" style="display: block; padding: 0 10px">                unset( $fields[ $protect ] );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -90,7 +90,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $revision_data['post_parent']   = $post['ID'];

</span><span class="cx" style="display: block; padding: 0 10px">        $revision_data['post_status']   = 'inherit';

</span><span class="cx" style="display: block; padding: 0 10px">        $revision_data['post_type']     = 'revision';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $revision_data['post_name']     = $autosave ? "$post[ID]-autosave-v1" : "$post[ID]-revision-v1"; // "1" is the revisioning system version

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $revision_data['post_name']     = $autosave ? "$post[ID]-autosave-v1" : "$post[ID]-revision-v1"; // "1" is the revisioning system version.

</ins><span class="cx" style="display: block; padding: 0 10px">         $revision_data['post_date']     = isset( $post['post_modified'] ) ? $post['post_modified'] : '';

</span><span class="cx" style="display: block; padding: 0 10px">        $revision_data['post_date_gmt'] = isset( $post['post_modified_gmt'] ) ? $post['post_modified_gmt'] : '';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -130,12 +130,14 @@

</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">-        // Compare the proposed update with the last stored revision verifying that

-       // they are different, unless a plugin tells us to always save regardless.

-       // If no previous revisions, save one

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*

+        * Compare the proposed update with the last stored revision verifying that

+        * they are different, unless a plugin tells us to always save regardless.

+        * If no previous revisions, save one.

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         $revisions = wp_get_post_revisions( $post_id );

</span><span class="cx" style="display: block; padding: 0 10px">        if ( $revisions ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // grab the last revision, but not an autosave

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Grab the last revision, but not an autosave.

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $revisions as $revision ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( false !== strpos( $revision->post_name, "{$revision->post_parent}-revision" ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $last_revision = $revision;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -180,7 +182,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                         */

</span><span class="cx" style="display: block; padding: 0 10px">                        $post_has_changed = (bool) apply_filters( 'wp_save_post_revision_post_has_changed', $post_has_changed, $last_revision, $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">-                        //don't save revision if post unchanged

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Don't save revision if post unchanged.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( ! $post_has_changed ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                return;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -311,7 +313,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 = _wp_post_revision_data( $post, $autosave );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $post = wp_slash( $post ); //since data is from db

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = wp_slash( $post ); // Since data is from DB.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $revision_id = wp_insert_post( $post );

</span><span class="cx" style="display: block; padding: 0 10px">        if ( is_wp_error( $revision_id ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -397,7 +399,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $update['ID'] = $revision['post_parent'];

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $update = wp_slash( $update ); //since data is from db

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $update = wp_slash( $update ); // Since data is from DB.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $post_id = wp_update_post( $update );

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! $post_id || is_wp_error( $post_id ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -404,7 +406,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                return $post_id;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Update last edit user

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Update last edit user.

</ins><span class="cx" style="display: block; padding: 0 10px">         update_post_meta( $post_id, '_edit_last', get_current_user_id() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -623,7 +625,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        } else {

</span><span class="cx" style="display: block; padding: 0 10px">                $term = get_term_by( 'slug', 'post-format-' . sanitize_key( $_REQUEST['post_format'] ), 'post_format' );

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $term ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $terms = array( $term ); // Can only have one post format

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $terms = array( $term ); // Can only have one post format.

</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">@@ -703,25 +705,25 @@

</span><span class="cx" style="display: block; padding: 0 10px"> function _wp_upgrade_revisions_of_post( $post, $revisions ) {

</span><span class="cx" style="display: block; padding: 0 10px">        global $wpdb;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Add post option exclusively

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Add post option exclusively.

</ins><span class="cx" style="display: block; padding: 0 10px">         $lock   = "revision-upgrade-{$post->ID}";

</span><span class="cx" style="display: block; padding: 0 10px">        $now    = time();

</span><span class="cx" style="display: block; padding: 0 10px">        $result = $wpdb->query( $wpdb->prepare( "INSERT IGNORE INTO `$wpdb->options` (`option_name`, `option_value`, `autoload`) VALUES (%s, %s, 'no') /* LOCK */", $lock, $now ) );

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! $result ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If we couldn't get a lock, see how old the previous lock is

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If we couldn't get a lock, see how old the previous lock is.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $locked = get_option( $lock );

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! $locked ) {

<span class="cx" style="display: block; padding: 0 10px">                        // Can't write to the lock, and can't read the lock.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Something broken has happened

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Something broken has happened.

</ins><span class="cx" style="display: block; padding: 0 10px">                         return false;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $locked > $now - 3600 ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Lock is not too old: some other process may be upgrading this post.  Bail.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Lock is not too old: some other process may be upgrading this post. Bail.

</ins><span class="cx" style="display: block; padding: 0 10px">                         return false;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Lock is too old - update it (below) and continue

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Lock is too old - update it (below) and continue.

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">        // If we could get a lock, re-"add" the option to fire all the correct filters.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -736,7 +738,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this_revision_version = _wp_get_post_revision_version( $this_revision );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Something terrible happened

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Something terrible happened.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( false === $this_revision_version ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        continue;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -748,14 +750,16 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        continue;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Always update the revision version

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Always update the revision version.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $update = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'post_name' => preg_replace( '/^(\d+-(?:autosave|revision))[\d-]*$/', '$1-v1', $this_revision->post_name ),

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If this revision is the oldest revision of the post, i.e. no $prev_revision,

-               // the correct post_author is probably $post->post_author, but that's only a good guess.

-               // Update the revision version only and Leave the author as-is.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /*

+                * If this revision is the oldest revision of the post, i.e. no $prev_revision,

+                * the correct post_author is probably $post->post_author, but that's only a good guess.

+                * Update the revision version only and Leave the author as-is.

+                */

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $prev_revision ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $prev_revision_version = _wp_get_post_revision_version( $prev_revision );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -765,7 +769,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">-                // Upgrade this revision

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Upgrade this revision.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $result = $wpdb->update( $wpdb->posts, $update, array( 'ID' => $this_revision->ID ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $result ) {

</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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/rewrite.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -157,7 +157,7 @@

<span class="cx" style="display: block; padding: 0 10px">  * @param string $query Optional. String to append to the rewritten query. Must end in '='. Default empty.

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function add_rewrite_tag( $tag, $regex, $query = '' ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // validate the tag's name

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Validate the tag's name.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( strlen( $tag ) < 3 || $tag[0] != '%' || $tag[ strlen( $tag ) - 1 ] != '%' ) {

</span><span class="cx" style="display: block; padding: 0 10px">                return;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -253,7 +253,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $hook = 'do_feed_' . $feedname;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Remove default function hook

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Remove default function hook.

</ins><span class="cx" style="display: block; padding: 0 10px">         remove_action( $hook, $hook );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        add_action( $hook, $function, 10, 2 );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -420,7 +420,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        } elseif ( 'monthnum' === $compare && isset( $query_vars['day'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $maybe_page = $query_vars['day'];

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Bug found in #11694 - 'page' was returning '/4'

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Bug found in #11694 - 'page' was returning '/4'.

</ins><span class="cx" style="display: block; padding: 0 10px">         $maybe_page = (int) trim( $maybe_page, '/' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $post_page_count = substr_count( $post->post_content, '<!--nextpage-->' ) + 1;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -485,7 +485,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                return 0;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // First, check to see if there is a 'p=N' or 'page_id=N' to match against

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // First, check to see if there is a 'p=N' or 'page_id=N' to match against.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( preg_match( '#[?&](p|page_id|attachment_id)=(\d+)#', $url, $values ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $id = absint( $values[2] );

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $id ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -493,11 +493,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Get rid of the #anchor

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Get rid of the #anchor.

</ins><span class="cx" style="display: block; padding: 0 10px">         $url_split = explode( '#', $url );

</span><span class="cx" style="display: block; padding: 0 10px">        $url       = $url_split[0];

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Get rid of URL ?query=string

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Get rid of URL ?query=string.

</ins><span class="cx" style="display: block; padding: 0 10px">         $url_split = explode( '?', $url );

</span><span class="cx" style="display: block; padding: 0 10px">        $url       = $url_split[0];

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -505,12 +505,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $scheme = parse_url( home_url(), PHP_URL_SCHEME );

</span><span class="cx" style="display: block; padding: 0 10px">        $url    = set_url_scheme( $url, $scheme );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Add 'www.' if it is absent and should be there

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Add 'www.' if it is absent and should be there.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( false !== strpos( home_url(), '://www.' ) && false === strpos( $url, '://www.' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $url = str_replace( '://', '://www.', $url );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Strip 'www.' if it is present and shouldn't be

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Strip 'www.' if it is present and shouldn't be.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( false === strpos( home_url(), '://www.' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $url = str_replace( '://www.', '://', $url );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -523,30 +523,30 @@

</span><span class="cx" style="display: 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">-        // Check to see if we are using rewrite rules

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Check to see if we are using rewrite rules.

</ins><span class="cx" style="display: block; padding: 0 10px">         $rewrite = $wp_rewrite->wp_rewrite_rules();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Not using rewrite rules, and 'p=N' and 'page_id=N' methods failed, so we're out of options

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Not using rewrite rules, and 'p=N' and 'page_id=N' methods failed, so we're out of options.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( empty( $rewrite ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                return 0;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Strip 'index.php/' if we're not using path info permalinks

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Strip 'index.php/' if we're not using path info permalinks.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! $wp_rewrite->using_index_permalinks() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $url = str_replace( $wp_rewrite->index . '/', '', $url );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( false !== strpos( trailingslashit( $url ), home_url( '/' ) ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Chop off http://domain.com/[path]

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Chop off http://domain.com/[path].

</ins><span class="cx" style="display: block; padding: 0 10px">                 $url = str_replace( home_url(), '', $url );

</span><span class="cx" style="display: block; padding: 0 10px">        } else {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Chop off /path/to/blog

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Chop off /path/to/blog.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $home_path = parse_url( home_url( '/' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $home_path = isset( $home_path['path'] ) ? $home_path['path'] : '';

</span><span class="cx" style="display: block; padding: 0 10px">                $url       = preg_replace( sprintf( '#^%s#', preg_quote( $home_path ) ), '', trailingslashit( $url ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Trim leading and lagging slashes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Trim leading and lagging slashes.

</ins><span class="cx" style="display: block; padding: 0 10px">         $url = trim( $url, '/' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $request              = $url;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -562,8 +562,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $request_match = $request;

</span><span class="cx" style="display: block; padding: 0 10px">        foreach ( (array) $rewrite as $match => $query ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If the requesting file is the anchor of the match, prepend it

-               // to the path info.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If the requesting file is the anchor of the match,

+               // prepend it to the path info.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! empty( $url ) && ( $url != $request ) && ( strpos( $match, $url ) === 0 ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $request_match = $url . '/' . $request;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -591,7 +591,7 @@

<span class="cx" style="display: block; padding: 0 10px">                        // Substitute the substring matches into the query.

</span><span class="cx" style="display: block; padding: 0 10px">                        $query = addslashes( WP_MatchesMapRegex::apply( $query, $matches ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Filter out non-public query vars

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Filter out non-public query vars.

</ins><span class="cx" style="display: block; padding: 0 10px">                         global $wp;

</span><span class="cx" style="display: block; padding: 0 10px">                        parse_str( $query, $query_vars );

</span><span class="cx" style="display: block; padding: 0 10px">                        $query = array();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -608,7 +608,7 @@

<span class="cx" style="display: block; padding: 0 10px">                        // Resolve conflicts between posts with numeric slugs and date archive queries.

</span><span class="cx" style="display: block; padding: 0 10px">                        $query = wp_resolve_numeric_slug_conflicts( $query );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Do the query

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Do the query.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $query = new WP_Query( $query );

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! empty( $query->posts ) && $query->is_singular ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                return $query->post->ID;

</span></span></pre></div>

<a id="trunksrcwpincludesscriptloaderphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/script-loader.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/script-loader.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/script-loader.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,8 +51,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $compressed = $compress_scripts && $concatenate_scripts && isset( $_SERVER['HTTP_ACCEPT_ENCODING'] )

</span><span class="cx" style="display: block; padding: 0 10px">                && false !== stripos( $_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip' ) && ! $force_uncompressed;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Load tinymce.js when running from /src, otherwise load wp-tinymce.js.gz (in production) or

-       // tinymce.min.js (when SCRIPT_DEBUG is true).

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Load tinymce.js when running from /src, otherwise load wp-tinymce.js.gz (in production)

+       // or tinymce.min.js (when SCRIPT_DEBUG is true).

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( $compressed ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $scripts->add( 'wp-tinymce', includes_url( 'js/tinymce/' ) . 'wp-tinymce.js', array(), $tinymce_version );

</span><span class="cx" style="display: block; padding: 0 10px">        } else {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -198,9 +198,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $polyfill .= (

<span class="cx" style="display: block; padding: 0 10px">                        // Test presence of feature...

</span><span class="cx" style="display: block; padding: 0 10px">                        '( ' . $test . ' ) || ' .

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // ...appending polyfill on any failures. Cautious viewers may balk

-                       // at the `document.write`. Its caveat of synchronous mid-stream

-                       // blocking write is exactly the behavior we need though.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 /*

+                        * ...appending polyfill on any failures. Cautious viewers may balk

+                        * at the `document.write`. Its caveat of synchronous mid-stream

+                        * blocking write is exactly the behavior we need though.

+                        */

</ins><span class="cx" style="display: block; padding: 0 10px">                         'document.write( \'<script src="' .

</span><span class="cx" style="display: block; padding: 0 10px">                        $src .

</span><span class="cx" style="display: block; padding: 0 10px">                        '"></scr\' + \'ipt>\' );'

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -593,7 +595,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">        static $suffixes;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( $suffixes === null ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                include( ABSPATH . WPINC . '/version.php' ); // include an unmodified $wp_version

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Include an unmodified $wp_version.

+               include( ABSPATH . WPINC . '/version.php' );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $develop_src = false !== strpos( $wp_version, '-src' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -795,15 +798,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $scripts->add( 'scriptaculous-controls', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/controls.js', array( 'scriptaculous-root' ), '1.9.0' );

</span><span class="cx" style="display: block; padding: 0 10px">        $scripts->add( 'scriptaculous', false, array( 'scriptaculous-dragdrop', 'scriptaculous-slider', 'scriptaculous-controls' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // not used in core, replaced by Jcrop.js

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Not used in core, replaced by Jcrop.js.

</ins><span class="cx" style="display: block; padding: 0 10px">         $scripts->add( 'cropper', '/wp-includes/js/crop/cropper.js', array( 'scriptaculous-dragdrop' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // jQuery

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // jQuery.

</ins><span class="cx" style="display: block; padding: 0 10px">         $scripts->add( 'jquery', false, array( 'jquery-core', 'jquery-migrate' ), '1.12.4-wp' );

</span><span class="cx" style="display: block; padding: 0 10px">        $scripts->add( 'jquery-core', '/wp-includes/js/jquery/jquery.js', array(), '1.12.4-wp' );

</span><span class="cx" style="display: block; padding: 0 10px">        $scripts->add( 'jquery-migrate', "/wp-includes/js/jquery/jquery-migrate$suffix.js", array(), '1.4.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">-        // full jQuery UI

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Full jQuery UI.

</ins><span class="cx" style="display: block; padding: 0 10px">         $scripts->add( 'jquery-ui-core', "/wp-includes/js/jquery/ui/core$dev_suffix.js", array( 'jquery' ), '1.11.4', 1 );

</span><span class="cx" style="display: block; padding: 0 10px">        $scripts->add( 'jquery-effects-core', "/wp-includes/js/jquery/ui/effect$dev_suffix.js", array( 'jquery' ), '1.11.4', 1 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -844,7 +847,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $scripts->add( 'jquery-ui-tooltip', "/wp-includes/js/jquery/ui/tooltip$dev_suffix.js", array( 'jquery-ui-core', 'jquery-ui-widget', 'jquery-ui-position' ), '1.11.4', 1 );

</span><span class="cx" style="display: block; padding: 0 10px">        $scripts->add( 'jquery-ui-widget', "/wp-includes/js/jquery/ui/widget$dev_suffix.js", array( 'jquery' ), '1.11.4', 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">-        // Strings for 'jquery-ui-autocomplete' live region messages

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Strings for 'jquery-ui-autocomplete' live region messages.

</ins><span class="cx" style="display: block; padding: 0 10px">         did_action( 'init' ) && $scripts->localize(

</span><span class="cx" style="display: block; padding: 0 10px">                'jquery-ui-autocomplete',

</span><span class="cx" style="display: block; padding: 0 10px">                'uiAutocompleteL10n',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -858,10 +861,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                )

</span><span class="cx" style="display: block; padding: 0 10px">        );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // deprecated, not used in core, most functionality is included in jQuery 1.3

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Deprecated, not used in core, most functionality is included in jQuery 1.3.

</ins><span class="cx" style="display: block; padding: 0 10px">         $scripts->add( 'jquery-form', "/wp-includes/js/jquery/jquery.form$suffix.js", array( 'jquery' ), '4.2.1', 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">-        // jQuery plugins

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // jQuery plugins.

</ins><span class="cx" style="display: block; padding: 0 10px">         $scripts->add( 'jquery-color', '/wp-includes/js/jquery/jquery.color.min.js', array( 'jquery' ), '2.1.2', 1 );

</span><span class="cx" style="display: block; padding: 0 10px">        $scripts->add( 'schedule', '/wp-includes/js/jquery/jquery.schedule.js', array( 'jquery' ), '20m', 1 );

</span><span class="cx" style="display: block; padding: 0 10px">        $scripts->add( 'jquery-query', '/wp-includes/js/jquery/jquery.query.js', array( 'jquery' ), '2.1.7', 1 );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -942,7 +945,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $scripts->add( 'wp-plupload', "/wp-includes/js/plupload/wp-plupload$suffix.js", array( 'plupload', 'jquery', 'json2', 'media-models' ), false, 1 );

</span><span class="cx" style="display: block; padding: 0 10px">        did_action( 'init' ) && $scripts->localize( 'wp-plupload', 'pluploadL10n', $uploader_l10n );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // keep 'swfupload' for back-compat.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Keep 'swfupload' for back-compat.

</ins><span class="cx" style="display: block; padding: 0 10px">         $scripts->add( 'swfupload', '/wp-includes/js/swfupload/swfupload.js', array(), '2201-20110113' );

</span><span class="cx" style="display: block; padding: 0 10px">        $scripts->add( 'swfupload-all', false, array( 'swfupload' ), '2201' );

</span><span class="cx" style="display: block; padding: 0 10px">        $scripts->add( 'swfupload-handlers', "/wp-includes/js/swfupload/handlers$suffix.js", array( 'swfupload-all', 'jquery' ), '2201-20110524' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1105,7 +1108,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                                /* translators: %d: Error count. */

</span><span class="cx" style="display: block; padding: 0 10px">                                                'singular' => _n( 'There is %d error which must be fixed before you can update this file.', 'There are %d errors which must be fixed before you can update this file.', 1 ),

</span><span class="cx" style="display: block; padding: 0 10px">                                                /* translators: %d: Error count. */

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                'plural'   => _n( 'There is %d error which must be fixed before you can update this file.', 'There are %d errors which must be fixed before you can update this file.', 2 ), // @todo This is lacking, as some languages have a dedicated dual form. For proper handling of plurals in JS, see #20491.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         'plural'   => _n( 'There is %d error which must be fixed before you can update this file.', 'There are %d errors which must be fixed before you can update this file.', 2 ),

+                                               // @todo This is lacking, as some languages have a dedicated dual form. For proper handling of plurals in JS, see #20491.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         ),

</span><span class="cx" style="display: block; padding: 0 10px">                                )

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1232,13 +1236,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        /* translators: %s: URL to the Customizer to load the autosaved version. */

</span><span class="cx" style="display: block; padding: 0 10px">                        'autosaveNotice'          => __( 'There is a more recent autosave of your changes than the one you are previewing. <a href="%s">Restore the autosave</a>' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        'videoHeaderNotice'       => __( 'This theme doesn&#8217;t support video headers on this page. Navigate to the front page or another page that supports video headers.' ),

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Used for overriding the file types allowed in plupload.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Used for overriding the file types allowed in Plupload.

</ins><span class="cx" style="display: block; padding: 0 10px">                         'allowedFiles'            => __( 'Allowed Files' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        'customCssError'          => array(

</span><span class="cx" style="display: block; padding: 0 10px">                                /* translators: %d: Error count. */

</span><span class="cx" style="display: block; padding: 0 10px">                                'singular' => _n( 'There is %d error which must be fixed before you can save.', 'There are %d errors which must be fixed before you can save.', 1 ),

</span><span class="cx" style="display: block; padding: 0 10px">                                /* translators: %d: Error count. */

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                'plural'   => _n( 'There is %d error which must be fixed before you can save.', 'There are %d errors which must be fixed before you can save.', 2 ), // @todo This is lacking, as some languages have a dedicated dual form. For proper handling of plurals in JS, see #20491.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         'plural'   => _n( 'There is %d error which must be fixed before you can save.', 'There are %d errors which must be fixed before you can save.', 2 ),

+                               // @todo This is lacking, as some languages have a dedicated dual form. For proper handling of plurals in JS, see #20491.

</ins><span class="cx" style="display: block; padding: 0 10px">                         ),

</span><span class="cx" style="display: block; padding: 0 10px">                        'pageOnFrontError'        => __( 'Homepage and posts page must be different.' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        'saveBlockedError'        => array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1245,7 +1250,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                /* translators: %s: Number of invalid settings. */

</span><span class="cx" style="display: block; padding: 0 10px">                                'singular' => _n( 'Unable to save due to %s invalid setting.', 'Unable to save due to %s invalid settings.', 1 ),

</span><span class="cx" style="display: block; padding: 0 10px">                                /* translators: %s: Number of invalid settings. */

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                'plural'   => _n( 'Unable to save due to %s invalid setting.', 'Unable to save due to %s invalid settings.', 2 ), // @todo This is lacking, as some languages have a dedicated dual form. For proper handling of plurals in JS, see #20491.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         'plural'   => _n( 'Unable to save due to %s invalid setting.', 'Unable to save due to %s invalid settings.', 2 ),

+                               // @todo This is lacking, as some languages have a dedicated dual form. For proper handling of plurals in JS, see #20491.

</ins><span class="cx" style="display: block; padding: 0 10px">                         ),

</span><span class="cx" style="display: block; padding: 0 10px">                        'scheduleDescription'     => __( 'Schedule your customization changes to publish ("go live") at a future date.' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        'themePreviewUnavailable' => __( 'Sorry, you can&#8217;t preview new themes when you have changes scheduled or saved as a draft. Please publish your changes, or wait until they publish to preview new themes.' ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1524,9 +1530,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        /* translators: %s: Error string for a failed installation. */

</span><span class="cx" style="display: block; padding: 0 10px">                                        'installFailed'            => __( 'Installation failed: %s' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                        /* translators: %s: Plugin name and version. */

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        'pluginInstallingLabel'    => _x( 'Installing %s...', 'plugin' ), // no ellipsis

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 'pluginInstallingLabel'    => _x( 'Installing %s...', 'plugin' ), // No ellipsis.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         /* translators: %s: Theme name and version. */

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        'themeInstallingLabel'     => _x( 'Installing %s...', 'theme' ), // no ellipsis

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 'themeInstallingLabel'     => _x( 'Installing %s...', 'theme' ), // No ellipsis.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         /* translators: %s: Plugin name and version. */

</span><span class="cx" style="display: block; padding: 0 10px">                                        'pluginInstalledLabel'     => _x( '%s installed!', 'plugin' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                        /* translators: %s: Theme name and version. */

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1616,7 +1622,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'setPostThumbnailL10n',

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'setThumbnail' => __( 'Use as featured image' ),

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                'saving'       => __( 'Saving...' ), // no ellipsis

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         'saving'       => __( 'Saving...' ), // No ellipsis.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'error'        => __( 'Could not set that as the thumbnail image. Try a different attachment.' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                'done'         => __( 'Done' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1662,7 +1668,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">  * @param WP_Styles $styles

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function wp_default_styles( &$styles ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        include( ABSPATH . WPINC . '/version.php' ); // include an unmodified $wp_version

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Include an unmodified $wp_version.

+       include( ABSPATH . WPINC . '/version.php' );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! defined( 'SCRIPT_DEBUG' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                define( 'SCRIPT_DEBUG', false !== strpos( $wp_version, '-src' ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1704,7 +1711,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $subsets .= ',vietnamese';

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Hotlink Open Sans, for now

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Hotlink Open Sans, for now.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $open_sans_font_url = "https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,300,400,600&subset=$subsets&display=fallback";

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1713,7 +1720,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $suffix = SCRIPT_DEBUG ? '' : '.min';

</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 CSS

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Admin CSS.

</ins><span class="cx" style="display: block; padding: 0 10px">         $styles->add( 'common', "/wp-admin/css/common$suffix.css" );

</span><span class="cx" style="display: block; padding: 0 10px">        $styles->add( 'forms', "/wp-admin/css/forms$suffix.css" );

</span><span class="cx" style="display: block; padding: 0 10px">        $styles->add( 'admin-menu', "/wp-admin/css/admin-menu$suffix.css" );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1743,11 +1750,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $styles->add( 'ie', "/wp-admin/css/ie$suffix.css" );

</span><span class="cx" style="display: block; padding: 0 10px">        $styles->add_data( 'ie', 'conditional', 'lte IE 7' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Common dependencies

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Common dependencies.

</ins><span class="cx" style="display: block; padding: 0 10px">         $styles->add( 'buttons', "/wp-includes/css/buttons$suffix.css" );

</span><span class="cx" style="display: block; padding: 0 10px">        $styles->add( 'dashicons', "/wp-includes/css/dashicons$suffix.css" );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Includes CSS

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Includes CSS.

</ins><span class="cx" style="display: block; padding: 0 10px">         $styles->add( 'admin-bar', "/wp-includes/css/admin-bar$suffix.css", array( 'dashicons' ) );

</span><span class="cx" style="display: block; padding: 0 10px">        $styles->add( 'wp-auth-check', "/wp-includes/css/wp-auth-check$suffix.css", array( 'dashicons' ) );

</span><span class="cx" style="display: block; padding: 0 10px">        $styles->add( 'editor-buttons', "/wp-includes/css/editor$suffix.css", array( 'dashicons' ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1757,7 +1764,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $styles->add( 'wp-embed-template-ie', "/wp-includes/css/wp-embed-template-ie$suffix.css" );

</span><span class="cx" style="display: block; padding: 0 10px">        $styles->add_data( 'wp-embed-template-ie', 'conditional', 'lte IE 8' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // External libraries and friends

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // External libraries and friends.

</ins><span class="cx" style="display: block; padding: 0 10px">         $styles->add( 'imgareaselect', '/wp-includes/js/imgareaselect/imgareaselect.css', array(), '0.9.8' );

</span><span class="cx" style="display: block; padding: 0 10px">        $styles->add( 'wp-jquery-ui-dialog', "/wp-includes/css/jquery-ui-dialog$suffix.css", array( 'dashicons' ) );

</span><span class="cx" style="display: block; padding: 0 10px">        $styles->add( 'mediaelement', '/wp-includes/js/mediaelement/mediaelementplayer-legacy.min.css', array(), '4.2.13-9993131' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1765,14 +1772,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $styles->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.css', array( 'dashicons' ) );

</span><span class="cx" style="display: block; padding: 0 10px">        $styles->add( 'wp-codemirror', '/wp-includes/js/codemirror/codemirror.min.css', array(), '5.29.1-alpha-ee20357' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Deprecated CSS

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Deprecated CSS.

</ins><span class="cx" style="display: block; padding: 0 10px">         $styles->add( 'deprecated-media', "/wp-admin/css/deprecated-media$suffix.css" );

</span><span class="cx" style="display: block; padding: 0 10px">        $styles->add( 'farbtastic', "/wp-admin/css/farbtastic$suffix.css", array(), '1.3u1' );

</span><span class="cx" style="display: block; padding: 0 10px">        $styles->add( 'jcrop', '/wp-includes/js/jcrop/jquery.Jcrop.min.css', array(), '0.9.12' );

<span class="cx" style="display: block; padding: 0 10px">        $styles->add( 'colors-fresh', false, array( 'wp-admin', 'buttons' ) ); // Old handle.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $styles->add( 'open-sans', $open_sans_font_url ); // No longer used in core as of 4.6

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $styles->add( 'open-sans', $open_sans_font_url ); // No longer used in core as of 4.6.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Packages styles

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Packages styles.

</ins><span class="cx" style="display: block; padding: 0 10px">         $fonts_url = '';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /*

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1832,9 +1839,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $styles->add( $handle, $path, $dependencies );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // RTL CSS

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // RTL CSS.

</ins><span class="cx" style="display: block; padding: 0 10px">         $rtl_styles = array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Admin CSS

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Admin CSS.

</ins><span class="cx" style="display: block; padding: 0 10px">                 'common',

</span><span class="cx" style="display: block; padding: 0 10px">                'forms',

</span><span class="cx" style="display: block; padding: 0 10px">                'admin-menu',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1858,7 +1865,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                'ie',

</span><span class="cx" style="display: block; padding: 0 10px">                'login',

</span><span class="cx" style="display: block; padding: 0 10px">                'site-health',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Includes CSS

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Includes CSS.

</ins><span class="cx" style="display: block; padding: 0 10px">                 'buttons',

</span><span class="cx" style="display: block; padding: 0 10px">                'admin-bar',

</span><span class="cx" style="display: block; padding: 0 10px">                'wp-auth-check',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1866,7 +1873,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                'media-views',

</span><span class="cx" style="display: block; padding: 0 10px">                'wp-pointer',

</span><span class="cx" style="display: block; padding: 0 10px">                'wp-jquery-ui-dialog',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Package styles

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Package styles.

</ins><span class="cx" style="display: block; padding: 0 10px">                 'wp-block-library-theme',

</span><span class="cx" style="display: block; padding: 0 10px">                'wp-edit-blocks',

</span><span class="cx" style="display: block; padding: 0 10px">                'wp-block-editor',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1877,7 +1884,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                'wp-format-library',

</span><span class="cx" style="display: block; padding: 0 10px">                'wp-list-reusable-blocks',

</span><span class="cx" style="display: block; padding: 0 10px">                'wp-nux',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Deprecated CSS

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Deprecated CSS.

</ins><span class="cx" style="display: block; padding: 0 10px">                 'deprecated-media',

</span><span class="cx" style="display: block; padding: 0 10px">                'farbtastic',

</span><span class="cx" style="display: block; padding: 0 10px">        );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1991,7 +1998,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'n',

</span><span class="cx" style="display: block; padding: 0 10px">                        'm', // Month.

</span><span class="cx" style="display: block; padding: 0 10px">                        'Y',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'y',            // Year.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'y', // Year.

</ins><span class="cx" style="display: block; padding: 0 10px">                 ),

</span><span class="cx" style="display: block; padding: 0 10px">                array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'dd',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2250,7 +2257,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        if ( $concat ) {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! empty( $wp_scripts->print_code ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        echo "\n<script{$type_attr}>\n";

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        echo "/* <![CDATA[ */\n"; // not needed in HTML 5

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 echo "/* <![CDATA[ */\n"; // Not needed in HTML 5.

</ins><span class="cx" style="display: block; padding: 0 10px">                         echo $wp_scripts->print_code;

</span><span class="cx" style="display: block; padding: 0 10px">                        echo "/* ]]> */\n";

</span><span class="cx" style="display: block; padding: 0 10px">                        echo "</script>\n";

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2293,7 +2300,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        global $wp_scripts;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! ( $wp_scripts instanceof WP_Scripts ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return array(); // no need to run if nothing is queued

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return array(); // No need to run if nothing is queued.

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px">        return print_head_scripts();

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span></span></pre></div>

<a id="trunksrcwpincludesshortcodesphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/shortcodes.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/shortcodes.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/shortcodes.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -217,7 +217,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $pattern = get_shortcode_regex( $tagnames );

</span><span class="cx" style="display: block; padding: 0 10px">        $content = preg_replace_callback( "/$pattern/", 'do_shortcode_tag', $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">-        // Always restore square braces so we don't break things like <!--[if IE ]>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Always restore square braces so we don't break things like <!--[if IE ]>.

</ins><span class="cx" style="display: block; padding: 0 10px">         $content = unescape_invalid_shortcodes( $content );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        return $content;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -254,39 +254,39 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px">        $tagregexp = join( '|', array_map( 'preg_quote', $tagnames ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // WARNING! Do not change this regex without changing do_shortcode_tag() and strip_shortcode_tag()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // WARNING! Do not change this regex without changing do_shortcode_tag() and strip_shortcode_tag().

</ins><span class="cx" style="display: block; padding: 0 10px">         // Also, see shortcode_unautop() and shortcode.js.

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        // phpcs:disable Squiz.Strings.ConcatenationSpacing.PaddingFound -- don't remove regex indentation

</span><span class="cx" style="display: block; padding: 0 10px">        return

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                '\\['                                // Opening bracket

-               . '(\\[?)'                           // 1: Optional second opening bracket for escaping shortcodes: [[tag]]

-               . "($tagregexp)"                     // 2: Shortcode name

-               . '(?![\\w-])'                       // Not followed by word character or hyphen

-               . '('                                // 3: Unroll the loop: Inside the opening shortcode tag

-               .     '[^\\]\\/]*'                   // Not a closing bracket or forward slash

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         '\\['                                // Opening bracket.

+               . '(\\[?)'                           // 1: Optional second opening bracket for escaping shortcodes: [[tag]].

+               . "($tagregexp)"                     // 2: Shortcode name.

+               . '(?![\\w-])'                       // Not followed by word character or hyphen.

+               . '('                                // 3: Unroll the loop: Inside the opening shortcode tag.

+               .     '[^\\]\\/]*'                   // Not a closing bracket or forward slash.

</ins><span class="cx" style="display: block; padding: 0 10px">                 .     '(?:'

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                .         '\\/(?!\\])'               // A forward slash not followed by a closing bracket

-               .         '[^\\]\\/]*'               // Not a closing bracket or forward slash

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         .         '\\/(?!\\])'               // A forward slash not followed by a closing bracket.

+               .         '[^\\]\\/]*'               // Not a closing bracket or forward slash.

</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                .     '(\\/)'                        // 4: Self closing tag ...

-               .     '\\]'                          // ... and closing bracket

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         .     '(\\/)'                        // 4: Self closing tag...

+               .     '\\]'                          // ...and closing bracket.

</ins><span class="cx" style="display: block; padding: 0 10px">                 . '|'

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                .     '\\]'                          // Closing bracket

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         .     '\\]'                          // Closing bracket.

</ins><span class="cx" style="display: block; padding: 0 10px">                 .     '(?:'

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                .         '('                        // 5: Unroll the loop: Optionally, anything between the opening and closing shortcode tags

-               .             '[^\\[]*+'             // Not an opening bracket

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         .         '('                        // 5: Unroll the loop: Optionally, anything between the opening and closing shortcode tags.

+               .             '[^\\[]*+'             // Not an opening bracket.

</ins><span class="cx" style="display: block; padding: 0 10px">                 .             '(?:'

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                .                 '\\[(?!\\/\\2\\])' // An opening bracket not followed by the closing shortcode tag

-               .                 '[^\\[]*+'         // Not an opening bracket

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         .                 '\\[(?!\\/\\2\\])' // An opening bracket not followed by the closing shortcode tag.

+               .                 '[^\\[]*+'         // Not an opening bracket.

</ins><span class="cx" style="display: block; padding: 0 10px">                 .             ')*+'

</span><span class="cx" style="display: block; padding: 0 10px">                .         ')'

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                .         '\\[\\/\\2\\]'             // Closing shortcode tag

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         .         '\\[\\/\\2\\]'             // Closing shortcode tag.

</ins><span class="cx" style="display: block; padding: 0 10px">                 .     ')?'

</span><span class="cx" style="display: block; padding: 0 10px">                . ')'

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                . '(\\]?)';                          // 6: Optional second closing brocket for escaping shortcodes: [[tag]]

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         . '(\\]?)';                          // 6: Optional second closing brocket for escaping shortcodes: [[tag]].

</ins><span class="cx" style="display: block; padding: 0 10px">         // phpcs:enable

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -306,7 +306,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> function do_shortcode_tag( $m ) {

</span><span class="cx" style="display: block; padding: 0 10px">        global $shortcode_tags;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // allow [[foo]] syntax for escaping a tag

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Allow [[foo]] syntax for escaping a tag.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( $m[1] == '[' && $m[6] == ']' ) {

</span><span class="cx" style="display: block; padding: 0 10px">                return substr( $m[0], 1, -1 );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -396,7 +396,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $noopen || $noclose ) {

<span class="cx" style="display: block; padding: 0 10px">                        // This element does not contain shortcodes.

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( $noopen xor $noclose ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Need to encode stray [ or ] chars.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Need to encode stray '[' or ']' chars.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $element = strtr( $element, $trans );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                        continue;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -403,7 +403,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 ( $ignore_html || '<!--' === substr( $element, 0, 4 ) || '<![CDATA[' === substr( $element, 0, 9 ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Encode all [ and ] chars.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Encode all '[' and ']' chars.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $element = strtr( $element, $trans );

</span><span class="cx" style="display: block; padding: 0 10px">                        continue;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -415,12 +415,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                $element = preg_replace_callback( "/$pattern/", 'do_shortcode_tag', $element );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Looks like we found some crazy unfiltered HTML.  Skipping it for sanity.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Looks like we found some crazy unfiltered HTML. Skipping it for sanity.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $element = strtr( $element, $trans );

</span><span class="cx" style="display: block; padding: 0 10px">                        continue;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Get element name

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Get element name.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $front   = array_shift( $attributes );

</span><span class="cx" style="display: block; padding: 0 10px">                $back    = array_pop( $attributes );

</span><span class="cx" style="display: block; padding: 0 10px">                $matches = array();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -432,18 +432,20 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $open  = strpos( $attr, '[' );

</span><span class="cx" style="display: block; padding: 0 10px">                        $close = strpos( $attr, ']' );

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( false === $open || false === $close ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                continue; // Go to next attribute.  Square braces will be escaped at end of loop.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         continue; // Go to next attribute. Square braces will be escaped at end of loop.

</ins><span class="cx" style="display: block; padding: 0 10px">                         }

</span><span class="cx" style="display: block; padding: 0 10px">                        $double = strpos( $attr, '"' );

</span><span class="cx" style="display: block; padding: 0 10px">                        $single = strpos( $attr, "'" );

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ( false === $single || $open < $single ) && ( false === $double || $open < $double ) ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // $attr like '[shortcode]' or 'name = [shortcode]' implies unfiltered_html.

-                               // In this specific situation we assume KSES did not run because the input

-                               // was written by an administrator, so we should avoid changing the output

-                               // and we do not need to run KSES here.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         /*

+                                * $attr like '[shortcode]' or 'name = [shortcode]' implies unfiltered_html.

+                                * In this specific situation we assume KSES did not run because the input

+                                * was written by an administrator, so we should avoid changing the output

+                                * and we do not need to run KSES here.

+                                */

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $attr = preg_replace_callback( "/$pattern/", 'do_shortcode_tag', $attr );

</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">-                                // $attr like 'name = "[shortcode]"' or "name = '[shortcode]'"

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // $attr like 'name = "[shortcode]"' or "name = '[shortcode]'".

</ins><span class="cx" style="display: block; padding: 0 10px">                                 // We do not know if $content was unfiltered. Assume KSES ran before shortcodes.

</span><span class="cx" style="display: block; padding: 0 10px">                                $count    = 0;

</span><span class="cx" style="display: block; padding: 0 10px">                                $new_attr = preg_replace_callback( "/$pattern/", 'do_shortcode_tag', $attr, -1, $count );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -459,7 +461,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">                $element = $front . implode( '', $attributes ) . $back;

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Now encode any remaining [ or ] chars.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Now encode any remaining '[' or ']' chars.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $element = strtr( $element, $trans );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -646,7 +648,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $pattern = get_shortcode_regex( $tagnames );

</span><span class="cx" style="display: block; padding: 0 10px">        $content = preg_replace_callback( "/$pattern/", 'strip_shortcode_tag', $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">-        // Always restore square braces so we don't break things like <!--[if IE ]>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Always restore square braces so we don't break things like <!--[if IE ]>.

</ins><span class="cx" style="display: block; padding: 0 10px">         $content = unescape_invalid_shortcodes( $content );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        return $content;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -661,7 +663,7 @@

<span class="cx" style="display: block; padding: 0 10px">  * @return string|false The content stripped of the tag, otherwise false.

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function strip_shortcode_tag( $m ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // allow [[foo]] syntax for escaping a tag

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Allow [[foo]] syntax for escaping a tag.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( $m[1] == '[' && $m[6] == ']' ) {

</span><span class="cx" style="display: block; padding: 0 10px">                return substr( $m[0], 1, -1 );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span></span></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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/taxonomy.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,7 +7,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> //

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Taxonomy Registration

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Taxonomy registration.

</ins><span class="cx" style="display: block; padding: 0 10px"> //

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -680,7 +680,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 API

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Term API.

</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">@@ -977,7 +977,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $term = array_shift( $terms );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // In the case of 'term_taxonomy_id', override the provided `$taxonomy` with whatever we find in the db.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // In the case of 'term_taxonomy_id', override the provided `$taxonomy` with whatever we find in the DB.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( 'term_taxonomy_id' === $field ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $taxonomy = $term->taxonomy;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1595,7 +1595,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                $value = apply_filters( "pre_{$taxonomy}_{$field}", $value );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Back compat filters

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Back compat filters.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( 'slug' === $field ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        /**

<span class="cx" style="display: block; padding: 0 10px">                         * Filters the category nicename before it is sanitized.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1692,7 +1692,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        );

</span><span class="cx" style="display: block; padding: 0 10px">        $args     = wp_parse_args( $args, $defaults );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // backward compatibility

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Backward compatibility.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( isset( $args['ignore_empty'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $args['hide_empty'] = $args['ignore_empty'];

</span><span class="cx" style="display: block; padding: 0 10px">                unset( $args['ignore_empty'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1776,7 +1776,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        if ( 'category' === $taxonomy ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $defaults['default'] = (int) get_option( 'default_category' );

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $defaults['default'] === $term ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return 0; // Don't delete the default category

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return 0; // Don't delete the default 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"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1803,7 +1803,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        do_action( 'pre_delete_term', $term, $taxonomy );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Update children to point to new parent

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Update children to point to new parent.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( is_taxonomy_hierarchical( $taxonomy ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $term_obj = get_term( $term, $taxonomy );

</span><span class="cx" style="display: block; padding: 0 10px">                if ( is_wp_error( $term_obj ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2269,7 +2269,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $term_id = (int) $wpdb->insert_id;

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Seems unreachable, However, Is used in the case that a term name is provided, which sanitizes to an empty string.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Seems unreachable. However, is used in the case that a term name is provided, which sanitizes to an empty string.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( empty( $slug ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $slug = sanitize_title( $slug, $term_id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2817,7 +2817,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $term_id = (int) $term_id;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // First, get all of the original args

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // First, get all of the original args.

</ins><span class="cx" style="display: block; padding: 0 10px">         $term = get_term( $term_id, $taxonomy );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( is_wp_error( $term ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2911,7 +2911,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        $parent = (int) apply_filters( 'wp_update_term_parent', $args['parent'], $term_id, $taxonomy, $parsed_args, $args );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Check for duplicate slug

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Check for duplicate slug.

</ins><span class="cx" style="display: block; padding: 0 10px">         $duplicate = get_term_by( 'slug', $slug, $taxonomy );

</span><span class="cx" style="display: block; padding: 0 10px">        if ( $duplicate && $duplicate->term_id !== $term_id ) {

<span class="cx" style="display: block; padding: 0 10px">                // If an empty slug was passed or the parent changed, reset the slug to something unique.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3068,7 +3068,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( is_bool( $defer ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $_defer = $defer;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // flush any deferred counts

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Flush any deferred counts.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! $defer ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        wp_update_term_count( null, null, true );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3148,10 +3148,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $object_types == array_filter( $object_types, 'post_type_exists' ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Only post types are attached to this taxonomy

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Only post types are attached to this taxonomy.

</ins><span class="cx" style="display: block; padding: 0 10px">                         _update_post_term_count( $terms, $taxonomy );

</span><span class="cx" style="display: block; padding: 0 10px">                } else {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Default count updater

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Default count updater.

</ins><span class="cx" style="display: block; padding: 0 10px">                         _update_generic_term_count( $terms, $taxonomy );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3162,7 +3162,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> //

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Cache

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Cache.

</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">@@ -3452,7 +3452,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">-// Private

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Private.

</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">@@ -3669,7 +3669,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">-// Default callbacks

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Default callbacks.

</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">@@ -4237,7 +4237,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">                $termlink = home_url( user_trailingslashit( $termlink, 'category' ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Back Compat filters.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

+       // Back compat filters.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( 'post_tag' === $taxonomy ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4569,7 +4570,7 @@

<span class="cx" style="display: block; padding: 0 10px">  * @return int The new parent for the term.

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function wp_check_term_hierarchy_for_loops( $parent, $term_id, $taxonomy ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Nothing fancy here - bail

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Nothing fancy here - bail.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! $parent ) {

</span><span class="cx" style="display: block; padding: 0 10px">                return 0;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4582,7 +4583,7 @@

<span class="cx" style="display: block; padding: 0 10px">        // Now look for larger loops.

</span><span class="cx" style="display: block; padding: 0 10px">        $loop = wp_find_hierarchy_loop( 'wp_get_term_taxonomy_parent_id', $term_id, $parent, array( $taxonomy ) );

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! $loop ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return $parent; // No loop

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return $parent; // No loop.

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">        // Setting $parent to the given value causes a loop.

</span></span></pre></div>

<a id="trunksrcwpincludestemplatephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/template.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/template.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/template.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -428,7 +428,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $pagename = get_query_var( 'pagename' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! $pagename && $id ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If a static page is set as the front page, $pagename will not be set. Retrieve it from the queried object

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If a static page is set as the front page, $pagename will not be set.

+               // Retrieve it from the queried object.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post = get_queried_object();

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $post ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $pagename = $post->post_name;

</span></span></pre></div>

<a id="trunksrcwpincludesthemecompatcommentsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/theme-compat/comments.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/theme-compat/comments.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/theme-compat/comments.php     2020-01-29 00:43:23 UTC (rev 47122)

</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">        sprintf( __( 'Please include a %s template in your theme.' ), basename( __FILE__ ) )

</span><span class="cx" style="display: block; padding: 0 10px"> );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Do not delete these lines

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Do not delete these lines.

</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $_SERVER['SCRIPT_FILENAME'] ) && 'comments.php' == basename( $_SERVER['SCRIPT_FILENAME'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">        die( 'Please do not load this page directly. Thanks!' );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,12 +62,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                <div class="alignleft"><?php previous_comments_link(); ?></div>

</span><span class="cx" style="display: block; padding: 0 10px">                <div class="alignright"><?php next_comments_link(); ?></div>

</span><span class="cx" style="display: block; padding: 0 10px">        </div>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php else : // this is displayed if there are no comments so far ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php else : // This is displayed if there are no comments so far. ?>

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        <?php if ( comments_open() ) : ?>

</span><span class="cx" style="display: block; padding: 0 10px">                <!-- If comments are open, but there are no comments. -->

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        <?php else : // comments are closed ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php else : // Comments are closed. ?>

</ins><span class="cx" style="display: block; padding: 0 10px">                 <!-- If comments are closed. -->

</span><span class="cx" style="display: block; padding: 0 10px">                <p class="nocomments"><?php _e( 'Comments are closed.' ); ?></p>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunksrcwpincludesthemecompatheaderphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/theme-compat/header.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/theme-compat/header.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/theme-compat/header.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,11 +30,11 @@

</span><span class="cx" style="display: block; padding: 0 10px"> <style type="text/css" media="screen">

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        <?php

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Checks to see whether it needs a sidebar

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Checks to see whether it needs a sidebar.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( empty( $withcomments ) && ! is_single() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                ?>

</span><span class="cx" style="display: block; padding: 0 10px">        #page { background: url("<?php bloginfo( 'stylesheet_directory' ); ?>/images/kubrickbg-<?php bloginfo( 'text_direction' ); ?>.jpg") repeat-y top; border: none; }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php } else { // No sidebar ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php } else { // No sidebar. ?>

</ins><span class="cx" style="display: block; padding: 0 10px">         #page { background: url("<?php bloginfo( 'stylesheet_directory' ); ?>/images/kubrickbgwide.jpg") repeat-y top; border: none; }

</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="trunksrcwpincludesthemephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/theme.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/theme.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/theme.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -398,9 +398,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">        global $wp_theme_directories;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! file_exists( $directory ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Try prepending as the theme directory could be relative to the content directory

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Try prepending as the theme directory could be relative to the content directory.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $directory = WP_CONTENT_DIR . '/' . $directory;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If this directory does not exist, return and do not register

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If this directory does not exist, return and do not register.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! file_exists( $directory ) ) {

</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">@@ -446,9 +446,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $wp_theme_directories = (array) $wp_theme_directories;

</span><span class="cx" style="display: block; padding: 0 10px">        $relative_theme_roots = array();

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Set up maybe-relative, maybe-absolute array of theme directories.

-       // We always want to return absolute, but we need to cache relative

-       // to use in get_theme_root().

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*

+        * Set up maybe-relative, maybe-absolute array of theme directories.

+        * We always want to return absolute, but we need to cache relative

+        * to use in get_theme_root().

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         foreach ( $wp_theme_directories as $theme_root ) {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( 0 === strpos( $theme_root, WP_CONTENT_DIR ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $relative_theme_roots[ str_replace( WP_CONTENT_DIR, '', $theme_root ) ] = $theme_root;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -482,10 +484,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        return $found_themes;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! is_int( $cache_expiration ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $cache_expiration = 1800; // half hour

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $cache_expiration = 30 * MINUTE_IN_SECONDS;

</ins><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">-                $cache_expiration = 1800; // half hour

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $cache_expiration = 30 * MINUTE_IN_SECONDS;

</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">        /* Loop the registered theme directories and extract all themes */

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -503,7 +505,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( file_exists( $theme_root . '/' . $dir . '/style.css' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                // wp-content/themes/a-single-theme

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // wp-content/themes is $theme_root, a-single-theme is $dir

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // wp-content/themes is $theme_root, a-single-theme is $dir.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $found_themes[ $dir ] = array(

</span><span class="cx" style="display: block; padding: 0 10px">                                        'theme_file' => $dir . '/style.css',

</span><span class="cx" style="display: block; padding: 0 10px">                                        'theme_root' => $theme_root,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -511,7 +513,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        } else {

</span><span class="cx" style="display: block; padding: 0 10px">                                $found_theme = false;

</span><span class="cx" style="display: block; padding: 0 10px">                                // wp-content/themes/a-folder-of-themes/*

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // wp-content/themes is $theme_root, a-folder-of-themes is $dir, then themes are $sub_dirs

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // wp-content/themes is $theme_root, a-folder-of-themes is $dir, then themes are $sub_dirs.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $sub_dirs = @ scandir( $theme_root . '/' . $dir );

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( ! $sub_dirs ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        trigger_error( "$theme_root/$dir is not readable", E_USER_NOTICE );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -675,7 +677,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $theme_root = false;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // If requesting the root for the current theme, consult options to avoid calling get_theme_roots()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If requesting the root for the current theme, consult options to avoid calling get_theme_roots().

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! $skip_cache ) {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( get_option( 'stylesheet' ) == $stylesheet_or_template ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $theme_root = get_option( 'stylesheet_root' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1277,7 +1279,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> function get_uploaded_header_images() {

</span><span class="cx" style="display: block; padding: 0 10px">        $header_images = array();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // @todo caching

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // @todo Caching.

</ins><span class="cx" style="display: block; padding: 0 10px">         $headers = get_posts(

</span><span class="cx" style="display: block; padding: 0 10px">                array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'post_type'  => 'attachment',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1984,7 +1986,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function get_editor_stylesheets() {

</span><span class="cx" style="display: block; padding: 0 10px">        $stylesheets = array();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // load editor_style.css if the current theme supports it

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Load editor_style.css if the current theme supports it.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! empty( $GLOBALS['editor_styles'] ) && is_array( $GLOBALS['editor_styles'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $editor_styles = $GLOBALS['editor_styles'];

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2121,7 +2123,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'title' => _x( 'Home', 'Theme starter content' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                'url'   => home_url( '/' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'page_home'       => array( // Deprecated in favor of link_home.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'page_home'       => array( // Deprecated in favor of 'link_home'.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'type'      => 'post_type',

</span><span class="cx" style="display: block; padding: 0 10px">                                'object'    => 'page',

</span><span class="cx" style="display: block; padding: 0 10px">                                'object_id' => '{{home}}',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2301,7 +2303,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px">                                break;

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // All that's left now are posts (besides attachments). Not a default case for the sake of clarity and future work.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // All that's left now are posts (besides attachments).

+                       // Not a default case for the sake of clarity and future work.

</ins><span class="cx" style="display: block; padding: 0 10px">                         case 'posts':

</span><span class="cx" style="display: block; padding: 0 10px">                                foreach ( $config[ $type ] as $id => $item ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        if ( is_array( $item ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2491,11 +2494,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                $args[0] = wp_parse_args( $args[0], $defaults );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // If a constant was defined, use that value. Otherwise, define the constant to ensure

-                       // the constant is always accurate (and is not defined later,  overriding our value).

-                       // As stated above, the first value wins.

-                       // Once we get to wp_loaded (just-in-time), define any constants we haven't already.

-                       // Constants are lame. Don't reference them. This is just for backward compatibility.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 /*

+                        * If a constant was defined, use that value. Otherwise, define the constant to ensure

+                        * the constant is always accurate (and is not defined later,  overriding our value).

+                        * As stated above, the first value wins.

+                        * Once we get to wp_loaded (just-in-time), define any constants we haven't already.

+                        * Constants are lame. Don't reference them. This is just for backward compatibility.

+                        */

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( defined( 'NO_HEADER_TEXT' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $args[0]['header-text'] = ! NO_HEADER_TEXT;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2828,7 +2833,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                return false;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // If no args passed then no extra checks need be performed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If no args passed then no extra checks need be performed.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! $args ) {

</span><span class="cx" style="display: block; padding: 0 10px">                return true;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2835,9 +2840,11 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        switch ( $feature ) {

</span><span class="cx" style="display: block; padding: 0 10px">                case 'post-thumbnails':

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // post-thumbnails can be registered for only certain content/post types by passing

-                       // an array of types to add_theme_support(). If no array was passed, then

-                       // any type is accepted

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 /*

+                        * post-thumbnails can be registered for only certain content/post types

+                        * by passing an array of types to add_theme_support().

+                        * If no array was passed, then any type is accepted.

+                        */

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( true === $_wp_theme_features[ $feature ] ) {  // Registered for all types

</span><span class="cx" style="display: block; padding: 0 10px">                                return true;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2846,11 +2853,12 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                case 'html5':

</span><span class="cx" style="display: block; padding: 0 10px">                case 'post-formats':

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // specific post formats can be registered by passing an array of types to

-                       // add_theme_support()

-

-                       // Specific areas of HTML5 support *must* be passed via an array to add_theme_support()

-

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 /*

+                        * Specific post formats can be registered by passing an array of types

+                        * to add_theme_support().

+                        *

+                        * Specific areas of HTML5 support *must* be passed via an array to add_theme_support().

+                        */

</ins><span class="cx" style="display: block; padding: 0 10px">                         $type = $args[0];

</span><span class="cx" style="display: block; padding: 0 10px">                        return in_array( $type, $_wp_theme_features[ $feature ][0] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2941,7 +2949,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        if ( $stylesheet ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $old_theme = wp_get_theme( $stylesheet );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Prevent widget & menu mapping from running since Customizer already called it up front

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Prevent widget & menu mapping from running since Customizer already called it up front.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( get_option( 'theme_switched_via_customizer' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        remove_action( 'after_switch_theme', '_wp_menus_changed' );

</span><span class="cx" style="display: block; padding: 0 10px">                        remove_action( 'after_switch_theme', '_wp_sidebars_changed' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3013,11 +3021,17 @@

</span><span class="cx" style="display: block; padding: 0 10px">        );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $theme             = null;

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $changeset_uuid    = false; // Value false indicates UUID should be determined after_setup_theme to either re-use existing saved changeset or else generate a new UUID if none exists.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $autosaved         = null;

</ins><span class="cx" style="display: block; padding: 0 10px">         $messenger_channel = null;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $autosaved         = null;

-       $branching         = false; // Set initially fo false since defaults to true for back-compat; can be overridden via the customize_changeset_branching filter.

</del><span class="cx" style="display: block; padding: 0 10px"> 

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        // Value false indicates UUID should be determined after_setup_theme

+       // to either re-use existing saved changeset or else generate a new UUID if none exists.

+       $changeset_uuid = false;

+

+       // Set initially fo false since defaults to true for back-compat;

+       // can be overridden via the customize_changeset_branching filter.

+       $branching = false;

+

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( $is_customize_admin_page && isset( $input_vars['changeset_uuid'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $changeset_uuid = sanitize_key( $input_vars['changeset_uuid'] );

</span><span class="cx" style="display: block; padding: 0 10px">        } elseif ( ! empty( $input_vars['customize_changeset_uuid'] ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3249,7 +3263,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                <?php        endif; ?>

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                b[c] = b[c].replace( rcs, ' ' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // The customizer requires postMessage and CORS (if the site is cross domain)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // The customizer requires postMessage and CORS (if the site is cross domain).

</ins><span class="cx" style="display: block; padding: 0 10px">                                 b[c] += ( window.postMessage && request ? ' ' : ' no-' ) + cs;

</span><span class="cx" style="display: block; padding: 0 10px">                        }());

</span><span class="cx" style="display: block; padding: 0 10px">                </script>

</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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/update.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,7 +27,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        global $wpdb, $wp_local_package;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // include an unmodified $wp_version

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Include an unmodified $wp_version.

</ins><span class="cx" style="display: block; padding: 0 10px">         include( ABSPATH . WPINC . '/version.php' );

</span><span class="cx" style="display: block; padding: 0 10px">        $php_version = phpversion();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,7 +34,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $current      = get_site_transient( 'update_core' );

</span><span class="cx" style="display: block; padding: 0 10px">        $translations = wp_get_installed_translations( 'core' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Invalidate the transient when $wp_version changes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Invalidate the transient when $wp_version changes.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( is_object( $current ) && $wp_version != $current->version_checked ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $current = false;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,8 +49,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $force_check = 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">-        // Wait 60 seconds between multiple version check requests

-       $timeout          = 60;

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Wait 1 minute between multiple version check requests.

+       $timeout          = MINUTE_IN_SECONDS;

</ins><span class="cx" style="display: block; padding: 0 10px">         $time_not_changed = isset( $current->last_checked ) && $timeout > ( time() - $current->last_checked );

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! $force_check && $time_not_changed ) {

</span><span class="cx" style="display: block; padding: 0 10px">                return;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,7 +65,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        $locale = apply_filters( 'core_version_check_locale', get_locale() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Update last_checked for current to prevent multiple blocking requests if request hangs

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Update last_checked for current to prevent multiple blocking requests if request hangs.

</ins><span class="cx" style="display: block; padding: 0 10px">         $current->last_checked = time();

</span><span class="cx" style="display: block; padding: 0 10px">        set_site_transient( 'update_core', $current );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -260,10 +260,10 @@

</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">-        // include an unmodified $wp_version

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Include an unmodified $wp_version.

</ins><span class="cx" style="display: block; padding: 0 10px">         include( ABSPATH . WPINC . '/version.php' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // If running blog-side, bail unless we've not checked in the last 12 hours

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If running blog-side, bail unless we've not checked in the last 12 hours.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! function_exists( 'get_plugins' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                require_once( ABSPATH . 'wp-admin/includes/plugin.php' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -323,13 +323,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Bail if we've checked recently and if nothing has changed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Bail if we've checked recently and if nothing has changed.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! $plugin_changed ) {

</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><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Update last_checked for current to prevent multiple blocking requests if request hangs

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Update last_checked for current to prevent multiple blocking requests if request hangs.

</ins><span class="cx" style="display: block; padding: 0 10px">         $current->last_checked = time();

</span><span class="cx" style="display: block; padding: 0 10px">        set_site_transient( 'update_plugins', $current );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</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 ( $doing_cron ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $timeout = 30;

</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">-                // Three seconds, plus one extra second for every 10 plugins

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Three seconds, plus one extra second for every 10 plugins.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $timeout = 3 + (int) ( count( $plugins ) / 10 );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -440,7 +440,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">-        // include an unmodified $wp_version

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Include an unmodified $wp_version.

</ins><span class="cx" style="display: block; padding: 0 10px">         include( ABSPATH . WPINC . '/version.php' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $installed_themes = wp_get_themes();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -513,13 +513,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Bail if we've checked recently and if nothing has changed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Bail if we've checked recently and if nothing has changed.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! $theme_changed ) {

</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><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Update last_checked for current to prevent multiple blocking requests if request hangs

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Update last_checked for current to prevent multiple blocking requests if request hangs.

</ins><span class="cx" style="display: block; padding: 0 10px">         $last_update->last_checked = time();

</span><span class="cx" style="display: block; padding: 0 10px">        set_site_transient( 'update_themes', $last_update );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -541,7 +541,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        if ( $doing_cron ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $timeout = 30;

</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">-                // Three seconds, plus one extra second for every 10 themes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Three seconds, plus one extra second for every 10 themes.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $timeout = 3 + (int) ( count( $themes ) / 10 );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -728,7 +728,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">  * @global string $wp_version

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> function _maybe_update_core() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // include an unmodified $wp_version

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Include an unmodified $wp_version.

</ins><span class="cx" style="display: block; padding: 0 10px">         include( ABSPATH . WPINC . '/version.php' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $current = get_site_transient( 'update_core' );

</span></span></pre></div>

<a id="trunksrcwpincludesuserphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/user.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/user.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/user.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -87,7 +87,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        $secure_cookie = apply_filters( 'secure_signon_cookie', $secure_cookie, $credentials );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        global $auth_secure_cookie; // XXX ugly hack to pass this to wp_authenticate_cookie

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $auth_secure_cookie; // XXX ugly hack to pass this to wp_authenticate_cookie().

</ins><span class="cx" style="display: block; padding: 0 10px">         $auth_secure_cookie = $secure_cookie;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        add_filter( 'authenticate', 'wp_authenticate_cookie', 30, 3 );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -208,7 +208,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $error = new WP_Error();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( empty( $email ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $error->add( 'empty_username', __( '<strong>ERROR</strong>: The email field is empty.' ) ); // Uses 'empty_username' for back-compat with wp_signon()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Uses 'empty_username' for back-compat with wp_signon().

+                       $error->add( 'empty_username', __( '<strong>ERROR</strong>: The email field is empty.' ) );

</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( $password ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -426,7 +427,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">-// User option functions

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// User option functions.

</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">@@ -480,9 +481,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $prefix = $wpdb->get_blog_prefix();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        if ( $user->has_prop( $prefix . $option ) ) { // Blog specific

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $user->has_prop( $prefix . $option ) ) { // Blog-specific.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $result = $user->get( $prefix . $option );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        } elseif ( $user->has_prop( $option ) ) { // User specific and cross-blog

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( $user->has_prop( $option ) ) { // User-specific and cross-blog.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $result = $user->get( $option );

</span><span class="cx" style="display: block; padding: 0 10px">        } else {

</span><span class="cx" style="display: block; padding: 0 10px">                $result = false;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -599,7 +600,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $user_id = (int) $user_id;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Logged out users can't have sites

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Logged out users can't have sites.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( empty( $user_id ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                return array();

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -733,8 +734,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $user_id = get_current_user_id();

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Technically not needed, but does save calls to get_site and get_user_meta

-       // in the event that the function is called when a user isn't logged in

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Technically not needed, but does save calls to get_site() and get_user_meta()

+       // in the event that the function is called when a user isn't logged in.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( empty( $user_id ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                return false;

</span><span class="cx" style="display: block; padding: 0 10px">        } else {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -763,7 +764,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">-        // no underscore before capabilities in $base_capabilities_key

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // No underscore before capabilities in $base_capabilities_key.

</ins><span class="cx" style="display: block; padding: 0 10px">         $base_capabilities_key = $wpdb->base_prefix . 'capabilities';

</span><span class="cx" style="display: block; padding: 0 10px">        $site_capabilities_key = $wpdb->base_prefix . $blog_id . '_capabilities';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -875,7 +876,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> function count_users( $strategy = 'time', $site_id = null ) {

</span><span class="cx" style="display: block; padding: 0 10px">        global $wpdb;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Initialize

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Initialize.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! $site_id ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $site_id = get_current_blog_id();

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -984,7 +985,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">-// Private helper functions

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Private helper functions.

</ins><span class="cx" style="display: block; padding: 0 10px"> //

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1540,11 +1541,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        return new WP_Error( 'invalid_user_id', __( 'Invalid user ID.' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // hashed in wp_update_user(), plaintext if called directly

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // hashed in wp_update_user(), plaintext if called directly.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $user_pass = ! empty( $userdata['user_pass'] ) ? $userdata['user_pass'] : $old_user_data->user_pass;

</span><span class="cx" style="display: block; padding: 0 10px">        } else {

</span><span class="cx" style="display: block; padding: 0 10px">                $update = false;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Hash the password

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Hash the password.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $user_pass = wp_hash_password( $userdata['user_pass'] );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1561,7 +1562,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        $pre_user_login = apply_filters( 'pre_user_login', $sanitized_user_login );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        //Remove any non-printable chars from the login string to see if we have ended up with an empty username

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Remove any non-printable chars from the login string to see if we have ended up with an empty username.

</ins><span class="cx" style="display: block; padding: 0 10px">         $user_login = trim( $pre_user_login );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        // user_login must be between 0 and 60 characters.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1933,7 +1934,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                return new WP_Error( 'invalid_user_id', __( 'Invalid user ID.' ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // First, get all of the original fields

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // First, get all of the original fields.

</ins><span class="cx" style="display: block; padding: 0 10px">         $user_obj = get_userdata( $ID );

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! $user_obj ) {

</span><span class="cx" style="display: block; padding: 0 10px">                return new WP_Error( 'invalid_user_id', __( 'Invalid user ID.' ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1941,7 +1942,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $user = $user_obj->to_array();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Add additional custom fields

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Add additional custom fields.

</ins><span class="cx" style="display: block; padding: 0 10px">         foreach ( _get_additional_user_keys( $user_obj ) as $key ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $user[ $key ] = get_user_meta( $ID, $key, true );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1950,7 +1951,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $user = add_magic_quotes( $user );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! empty( $userdata['user_pass'] ) && $userdata['user_pass'] !== $user_obj->user_pass ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If password is changing, hash it now

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If password is changing, hash it now.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $plaintext_pass        = $userdata['user_pass'];

</span><span class="cx" style="display: block; padding: 0 10px">                $userdata['user_pass'] = wp_hash_password( $userdata['user_pass'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2411,7 +2412,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        if ( $hash_is_correct && $expiration_time && time() < $expiration_time ) {

</span><span class="cx" style="display: block; padding: 0 10px">                return $user;

</span><span class="cx" style="display: block; padding: 0 10px">        } elseif ( $hash_is_correct && $expiration_time ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Key has an expiration time that's passed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Key has an expiration time that's passed.

</ins><span class="cx" style="display: block; padding: 0 10px">                 return new WP_Error( 'expired_key', __( 'Invalid key.' ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2491,7 +2492,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        $user_email = apply_filters( 'user_registration_email', $user_email );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Check the username

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Check the username.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( $sanitized_user_login == '' ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $errors->add( 'empty_username', __( '<strong>ERROR</strong>: Please enter a username.' ) );

</span><span class="cx" style="display: block; padding: 0 10px">        } elseif ( ! validate_username( $user_login ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2508,7 +2509,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">-        // Check the email address

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Check the email address.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( $user_email == '' ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $errors->add( 'empty_email', __( '<strong>ERROR</strong>: Please type your email address.' ) );

</span><span class="cx" style="display: block; padding: 0 10px">        } elseif ( ! is_email( $user_email ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2567,7 +2568,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                return $errors;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        update_user_option( $user_id, 'default_password_nag', true, true ); //Set up the Password change nag.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_user_option( $user_id, 'default_password_nag', true, true ); // Set up the password change nag.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Fires after a new user registration has been recorded.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2728,7 +2729,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        return $current_user;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Upgrade stdClass to WP_User

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Upgrade stdClass to WP_User.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( is_object( $current_user ) && isset( $current_user->ID ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $cur_id       = $current_user->ID;

</span><span class="cx" style="display: block; padding: 0 10px">                        $current_user = null;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3405,8 +3406,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $requests_query = new WP_Query(

</span><span class="cx" style="display: block; padding: 0 10px">                array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'post_type'     => 'user_request',

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'post_name__in' => array( $action_name ),  // Action name stored in post_name column.

-                       'title'         => $email_address, // Email address stored in post_title column.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'post_name__in' => array( $action_name ), // Action name stored in post_name column.

+                       'title'         => $email_address,        // Email address stored in post_title column.

</ins><span class="cx" style="display: block; padding: 0 10px">                         'post_status'   => array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'request-pending',

</span><span class="cx" style="display: block; padding: 0 10px">                                'request-confirmed',

</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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/vars.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,9 +19,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $is_lynx, $is_gecko, $is_winIE, $is_macIE, $is_opera, $is_NS4, $is_safari, $is_chrome, $is_iphone, $is_IE, $is_edge,

</span><span class="cx" style="display: block; padding: 0 10px">        $is_apache, $is_IIS, $is_iis7, $is_nginx;

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// On which page are we ?

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// On which page are we?

</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_admin() ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // wp-admin pages are checked more carefully

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // wp-admin pages are checked more carefully.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( is_network_admin() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                preg_match( '#/wp-admin/network/?(.*?)$#i', $_SERVER['PHP_SELF'], $self_matches );

</span><span class="cx" style="display: block; padding: 0 10px">        } elseif ( is_user_admin() ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,7 +38,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                preg_match( '#(.*?)(/|$)#', $pagenow, $self_matches );

</span><span class="cx" style="display: block; padding: 0 10px">                $pagenow = strtolower( $self_matches[1] );

</span><span class="cx" style="display: block; padding: 0 10px">                if ( '.php' !== substr( $pagenow, -4, 4 ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $pagenow .= '.php'; // for Options +Multiviews: /wp-admin/themes/index.php (themes.php is queried)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $pagenow .= '.php'; // For `Options +Multiviews`: /wp-admin/themes/index.php (themes.php is queried).

</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"> } else {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,7 +50,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> unset( $self_matches );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Simple browser detection

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Simple browser detection.

</ins><span class="cx" style="display: block; padding: 0 10px"> $is_lynx   = false;

</span><span class="cx" style="display: block; padding: 0 10px"> $is_gecko  = false;

</span><span class="cx" style="display: block; padding: 0 10px"> $is_winIE  = false;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,7 +106,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> $is_IE = ( $is_macIE || $is_winIE );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Server detection

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Server detection.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> /**

</span><span class="cx" style="display: block; padding: 0 10px">  * Whether the server software is Apache or something else

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -146,7 +146,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> function wp_is_mobile() {

</span><span class="cx" style="display: block; padding: 0 10px">        if ( empty( $_SERVER['HTTP_USER_AGENT'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $is_mobile = false;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        } elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'Mobile' ) !== false // many mobile devices (all iPhone, iPad, etc.)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'Mobile' ) !== false // Many mobile devices (all iPhone, iPad, etc.)

</ins><span class="cx" style="display: block; padding: 0 10px">                 || strpos( $_SERVER['HTTP_USER_AGENT'], 'Android' ) !== false

</span><span class="cx" style="display: block; padding: 0 10px">                || strpos( $_SERVER['HTTP_USER_AGENT'], 'Silk/' ) !== false

</span><span class="cx" style="display: block; padding: 0 10px">                || strpos( $_SERVER['HTTP_USER_AGENT'], 'Kindle' ) !== false

</span></span></pre></div>

<a id="trunksrcwpincludeswidgetsclasswpnavmenuwidgetphp"></a>

<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-nav-menu-widget.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets/class-wp-nav-menu-widget.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/widgets/class-wp-nav-menu-widget.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,7 +39,7 @@

<span class="cx" style="display: block; padding: 0 10px">         * @param array $instance Settings for the current Navigation Menu widget instance.

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function widget( $args, $instance ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Get menu

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Get menu.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $nav_menu = ! empty( $instance['nav_menu'] ) ? wp_get_nav_menu_object( $instance['nav_menu'] ) : false;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! $nav_menu ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -117,7 +117,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $title    = isset( $instance['title'] ) ? $instance['title'] : '';

</span><span class="cx" style="display: block; padding: 0 10px">                $nav_menu = isset( $instance['nav_menu'] ) ? $instance['nav_menu'] : '';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Get menus

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Get menus.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $menus = wp_get_nav_menus();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $empty_menus_style     = '';

</span></span></pre></div>

<a id="trunksrcwpincludeswidgetsclasswpwidgetcategoriesphp"></a>

<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-categories.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-categories.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/widgets/class-wp-widget-categories.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -160,7 +160,7 @@

<span class="cx" style="display: block; padding: 0 10px">         * @param array $instance Current settings.

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function form( $instance ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //Defaults

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Defaults.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $instance     = wp_parse_args( (array) $instance, array( 'title' => '' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $count        = isset( $instance['count'] ) ? (bool) $instance['count'] : false;

</span><span class="cx" style="display: block; padding: 0 10px">                $hierarchical = isset( $instance['hierarchical'] ) ? (bool) $instance['hierarchical'] : false;

</span></span></pre></div>

<a id="trunksrcwpincludeswidgetsclasswpwidgetcustomhtmlphp"></a>

<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-custom-html.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-custom-html.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/widgets/class-wp-widget-custom-html.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -70,10 +70,12 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                wp_add_inline_script( 'custom-html-widgets', sprintf( 'wp.customHtmlWidgets.idBases.push( %s );', wp_json_encode( $this->id_base ) ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Note that the widgets component in the customizer will also do the 'admin_print_scripts-widgets.php' action in WP_Customize_Widgets::print_scripts().

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Note that the widgets component in the customizer will also do

+               // the 'admin_print_scripts-widgets.php' action in WP_Customize_Widgets::print_scripts().

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_action( 'admin_print_scripts-widgets.php', array( $this, 'enqueue_admin_scripts' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Note that the widgets component in the customizer will also do the 'admin_footer-widgets.php' action in WP_Customize_Widgets::print_footer_scripts().

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Note that the widgets component in the customizer will also do

+               // the 'admin_footer-widgets.php' action in WP_Customize_Widgets::print_footer_scripts().

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_action( 'admin_footer-widgets.php', array( 'WP_Widget_Custom_HTML', 'render_control_template_scripts' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Note this action is used to ensure the help text is added to the end.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -225,7 +227,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                /* translators: %d: Error count. */

</span><span class="cx" style="display: block; padding: 0 10px">                                'singular' => _n( 'There is %d error which must be fixed before you can save.', 'There are %d errors which must be fixed before you can save.', 1 ),

</span><span class="cx" style="display: block; padding: 0 10px">                                /* translators: %d: Error count. */

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                'plural'   => _n( 'There is %d error which must be fixed before you can save.', 'There are %d errors which must be fixed before you can save.', 2 ), // @todo This is lacking, as some languages have a dedicated dual form. For proper handling of plurals in JS, see #20491.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         'plural'   => _n( 'There is %d error which must be fixed before you can save.', 'There are %d errors which must be fixed before you can save.', 2 ),

+                               // @todo This is lacking, as some languages have a dedicated dual form. For proper handling of plurals in JS, see #20491.

</ins><span class="cx" style="display: block; padding: 0 10px">                         ),

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                wp_add_inline_script( 'custom-html-widgets', sprintf( 'jQuery.extend( wp.customHtmlWidgets.l10n, %s );', wp_json_encode( $l10n ) ), 'after' );

</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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/widgets/class-wp-widget-links.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,7 +124,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function form( $instance ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //Defaults

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Defaults.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $instance  = wp_parse_args(

</span><span class="cx" style="display: block; padding: 0 10px">                        (array) $instance,

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/widgets/class-wp-widget-media.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,7 +106,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">                $this->registered = true;

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Note that the widgets component in the customizer will also do the 'admin_print_scripts-widgets.php' action in WP_Customize_Widgets::print_scripts().

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Note that the widgets component in the customizer will also do

+               // the 'admin_print_scripts-widgets.php' action in WP_Customize_Widgets::print_scripts().

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_action( 'admin_print_scripts-widgets.php', array( $this, 'enqueue_admin_scripts' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $this->is_preview() ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -113,7 +114,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_preview_scripts' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Note that the widgets component in the customizer will also do the 'admin_footer-widgets.php' action in WP_Customize_Widgets::print_footer_scripts().

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Note that the widgets component in the customizer will also do

+               // the 'admin_footer-widgets.php' action in WP_Customize_Widgets::print_footer_scripts().

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_action( 'admin_footer-widgets.php', array( $this, 'render_control_template_scripts' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'display_media_states', array( $this, 'display_media_state' ), 10, 2 );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -274,7 +276,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                        $value = $new_instance[ $field ];

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Workaround for rest_validate_value_from_schema() due to the fact that rest_is_boolean( '' ) === false, while rest_is_boolean( '1' ) is true.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 /*

+                        * Workaround for rest_validate_value_from_schema() due to the fact that

+                        * rest_is_boolean( '' ) === false, while rest_is_boolean( '1' ) is true.

+                        */

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( 'boolean' === $field_schema['type'] && '' === $value ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $value = false;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span></span></pre></div>

<a id="trunksrcwpincludeswidgetsclasswpwidgetpagesphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/widgets/class-wp-widget-pages.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets/class-wp-widget-pages.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/widgets/class-wp-widget-pages.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -130,7 +130,7 @@

<span class="cx" style="display: block; padding: 0 10px">         * @param array $instance Current settings.

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function form( $instance ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //Defaults

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Defaults.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $instance = wp_parse_args(

</span><span class="cx" style="display: block; padding: 0 10px">                        (array) $instance,

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span></span></pre></div>

<a id="trunksrcwpincludeswidgetsclasswpwidgetrecentcommentsphp"></a>

<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-recent-comments.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-recent-comments.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/widgets/class-wp-widget-recent-comments.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,7 +49,7 @@

<span class="cx" style="display: block; padding: 0 10px">                 * @param bool   $active  Whether the widget is active. Default true.

<span class="cx" style="display: block; padding: 0 10px">                 * @param string $id_base The widget ID.

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( ! current_theme_supports( 'widgets' ) // Temp hack #14876

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( ! current_theme_supports( 'widgets' ) // Temp hack #14876.

</ins><span class="cx" style="display: block; padding: 0 10px">                         || ! apply_filters( 'show_recent_comments_widget_style', true, $this->id_base ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span></span></pre></div>

<a id="trunksrcwpincludeswidgetsclasswpwidgetrssphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/widgets/class-wp-widget-rss.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets/class-wp-widget-rss.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/widgets/class-wp-widget-rss.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,7 +56,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        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">-                // self-url destruction sequence

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Self-URL destruction sequence.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( in_array( untrailingslashit( $url ), array( site_url(), home_url() ) ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span></span></pre></div>

<a id="trunksrcwpincludeswidgetsclasswpwidgetsearchphp"></a>

<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-search.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-search.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/widgets/class-wp-widget-search.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,7 +50,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        echo $args['before_title'] . $title . $args['after_title'];

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Use current theme search form if it exists

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Use current theme search form if it exists.

</ins><span class="cx" style="display: block; padding: 0 10px">                 get_search_form();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                echo $args['after_widget'];

</span></span></pre></div>

<a id="trunksrcwpincludeswidgetsclasswpwidgettagcloudphp"></a>

<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-tag-cloud.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-tag-cloud.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/widgets/class-wp-widget-tag-cloud.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -148,7 +148,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                switch ( count( $taxonomies ) ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // No tag cloud supporting taxonomies found, display error message

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // No tag cloud supporting taxonomies found, display error message.

</ins><span class="cx" style="display: block; padding: 0 10px">                         case 0:

</span><span class="cx" style="display: block; padding: 0 10px">                                echo '<p>' . __( 'The tag cloud will not be displayed since there are no taxonomies that support the tag cloud widget.' ) . '</p>';

</span><span class="cx" style="display: block; padding: 0 10px">                                printf( $input, '' );

</span></span></pre></div>

<a id="trunksrcwpincludeswidgetsclasswpwidgettextphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/widgets/class-wp-widget-text.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets/class-wp-widget-text.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/widgets/class-wp-widget-text.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -61,10 +61,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_preview_scripts' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Note that the widgets component in the customizer will also do the 'admin_print_scripts-widgets.php' action in WP_Customize_Widgets::print_scripts().

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Note that the widgets component in the customizer will also do

+               // the 'admin_print_scripts-widgets.php' action in WP_Customize_Widgets::print_scripts().

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_action( 'admin_print_scripts-widgets.php', array( $this, 'enqueue_admin_scripts' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Note that the widgets component in the customizer will also do the 'admin_footer-widgets.php' action in WP_Customize_Widgets::print_footer_scripts().

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Note that the widgets component in the customizer will also do

+               // the 'admin_footer-widgets.php' action in WP_Customize_Widgets::print_footer_scripts().

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_action( 'admin_footer-widgets.php', array( 'WP_Widget_Text', 'render_control_template_scripts' ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -121,7 +123,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $doc = new DOMDocument();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Suppress warnings generated by loadHTML

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Suppress warnings generated by loadHTML.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $errors = libxml_use_internal_errors( true );

</span><span class="cx" style="display: block; padding: 0 10px">                // phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged

</span><span class="cx" style="display: block; padding: 0 10px">                @$doc->loadHTML(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -373,7 +375,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'title'  => '',

</span><span class="cx" style="display: block; padding: 0 10px">                                'text'   => '',

</span><span class="cx" style="display: block; padding: 0 10px">                                'filter' => false, // For back-compat.

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                'visual' => null, // Must be explicitly defined.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         'visual' => null,  // Must be explicitly defined.

</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="trunksrcwpincludeswidgetsphp"></a>

<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.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/widgets.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,7 +19,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> //

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Global Variables

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Global Variables.

</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"> /** @ignore */

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,7 +91,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> //

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Template tags & API functions

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Template tags & API functions.

</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">@@ -186,10 +186,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Custom specified ID's are suffixed if they exist already.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Automatically generated sidebar names need to be suffixed regardless starting at -0

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Automatically generated sidebar names need to be suffixed regardless starting at -0.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( isset( $args['id'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $_args['id'] = $args['id'];

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $n           = 2; // Start at -2 for conflicting custom ID's

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $n           = 2; // Start at -2 for conflicting custom IDs.

</ins><span class="cx" style="display: block; padding: 0 10px">                         while ( is_registered_sidebar( $_args['id'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $_args['id'] = $args['id'] . '-' . $n++;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -529,7 +529,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $defaults          = array(

</span><span class="cx" style="display: block; padding: 0 10px">                'width'  => 250,

</span><span class="cx" style="display: block; padding: 0 10px">                'height' => 200,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        ); // height is never used

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ); // Height is never used.

</ins><span class="cx" style="display: block; padding: 0 10px">         $options           = wp_parse_args( $options, $defaults );

</span><span class="cx" style="display: block; padding: 0 10px">        $options['width']  = (int) $options['width'];

</span><span class="cx" style="display: block; padding: 0 10px">        $options['height'] = (int) $options['height'];

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -726,7 +726,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        (array) $wp_registered_widgets[ $id ]['params']

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Substitute HTML id and class attributes into before_widget

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Substitute HTML `id` and `class` attributes into `before_widget`.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $classname_ = '';

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( (array) $wp_registered_widgets[ $id ]['classname'] as $cn ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( is_string( $cn ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -947,7 +947,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> //

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Internal Functions

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Internal Functions.

</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">@@ -1075,7 +1075,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        if ( $single ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $settings = array( 2 => $settings );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If loading from the front page, update sidebar in memory but don't save to options

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If loading from the front page, update sidebar in memory but don't save to options.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( is_admin() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $sidebars_widgets = get_option( 'sidebars_widgets' );

</span><span class="cx" style="display: block; padding: 0 10px">                } else {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1376,11 +1376,11 @@

<span class="cx" style="display: block; padding: 0 10px">                                                                // Go back and check the next new sidebar.

</span><span class="cx" style="display: block; padding: 0 10px">                                                                continue 3;

</span><span class="cx" style="display: block; padding: 0 10px">                                                        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                } // endforeach ( $slug_group as $slug )

-                                       } // endforeach ( $existing_sidebars_widgets as $sidebar => $widgets )

-                               } // endforeach foreach ( $wp_registered_sidebars as $new_sidebar => $args )

-                       } // endforeach ( $slug_group as $slug )

-               } // endforeach ( $common_slug_groups as $slug_group )

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         } // End foreach ( $slug_group as $slug ).

+                                       } // End foreach ( $existing_sidebars_widgets as $sidebar => $widgets ).

+                               } // End foreach ( $wp_registered_sidebars as $new_sidebar => $args ).

+                       } // End foreach ( $slug_group as $slug ).

+               } // End foreach ( $common_slug_groups as $slug_group ).

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">        // Move any left over widgets to inactive sidebar.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1440,11 +1440,11 @@

<span class="cx" style="display: block; padding: 0 10px">                                                                // ...otherwise remove it from the old sidebar and keep it in the new one.

</span><span class="cx" style="display: block; padding: 0 10px">                                                                unset( $old_sidebars_widgets[ $old_sidebar ][ $key ] );

</span><span class="cx" style="display: block; padding: 0 10px">                                                        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                } // endif ( $active_key )

-                                       } // endforeach ( $old_widgets as $key => $widget_id )

-                               } // endforeach ( $new_sidebars_widgets as $new_sidebar => $new_widgets )

-                       } // endforeach ( $old_sidebars_widgets as $old_sidebar => $old_widgets )

-               } // endif ( ! empty( $old_sidebars_widgets ) )

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         } // End if ( $active_key ).

+                                       } // End foreach ( $old_widgets as $key => $widget_id ).

+                               } // End foreach ( $new_sidebars_widgets as $new_sidebar => $new_widgets ).

+                       } // End foreach ( $old_sidebars_widgets as $old_sidebar => $old_widgets ).

+               } // End if ( ! empty( $old_sidebars_widgets ) ).

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Restore widget settings from when theme was previously active.

</span><span class="cx" style="display: block; padding: 0 10px">                $new_sidebars_widgets = array_merge( $new_sidebars_widgets, $old_sidebars_widgets );

</span></span></pre></div>

<a id="trunksrcwpincludeswpdbphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/wp-db.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/wp-db.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-includes/wp-db.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -608,7 +608,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->show_errors();

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Use ext/mysqli if it exists unless WP_USE_EXT_MYSQL is defined as true

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Use ext/mysqli if it exists unless WP_USE_EXT_MYSQL is defined as true.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( function_exists( 'mysqli_connect' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->use_mysqli = true;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1176,7 +1176,7 @@

<span class="cx" style="display: block; padding: 0 10px">         * Escape data. Works on arrays.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @uses wpdb::_real_escape()

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since  2.8.0

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @since 2.8.0

</ins><span class="cx" style="display: block; padding: 0 10px">          *

</span><span class="cx" style="display: block; padding: 0 10px">         * @param  string|array $data

</span><span class="cx" style="display: block; padding: 0 10px">         * @return string|array escaped

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1348,7 +1348,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $query = str_replace( '"%s"', '%s', $query ); // Strip any existing double quotes.

</span><span class="cx" style="display: block; padding: 0 10px">                $query = preg_replace( '/(?<!%)%s/', "'%s'", $query ); // Quote the strings, avoiding escaped strings like %%s.

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $query = preg_replace( "/(?<!%)(%($allowed_format)?f)/", '%\\2F', $query ); // Force floats to be locale unaware.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $query = preg_replace( "/(?<!%)(%($allowed_format)?f)/", '%\\2F', $query ); // Force floats to be locale-unaware.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $query = preg_replace( "/%(?:%|$|(?!($allowed_format)?[sdF]))/", '%%\\1', $query ); // Escape any unescaped percents.

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1464,7 +1464,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        return false;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If there is an error then take note of it

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If there is an error then take note of it.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( is_multisite() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $msg = sprintf(

</span><span class="cx" style="display: block; padding: 0 10px">                                "%s [%s]\n%s\n",

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1562,12 +1562,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        mysqli_free_result( $this->result );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->result = null;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Sanity check before using the handle

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Sanity check before using the handle.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( empty( $this->dbh ) || ! ( $this->dbh instanceof mysqli ) ) {

</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">-                        // Clear out any results from a multi-query

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Clear out any results from a multi-query.

</ins><span class="cx" style="display: block; padding: 0 10px">                         while ( mysqli_more_results( $this->dbh ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                mysqli_next_result( $this->dbh );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1794,7 +1794,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $error_reporting = 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">-                // Disable warnings, as we don't want to see a multitude of "unable to connect" messages

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Disable warnings, as we don't want to see a multitude of "unable to connect" messages.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( WP_DEBUG ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $error_reporting = error_reporting();

</span><span class="cx" style="display: block; padding: 0 10px">                        error_reporting( $error_reporting & ~E_WARNING );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1801,8 +1801,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">                for ( $tries = 1; $tries <= $this->reconnect_retries; $tries++ ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // On the last try, re-enable warnings. We want to see a single instance of the

-                       // "unable to connect" message on the bail() screen, if it appears.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // On the last try, re-enable warnings. We want to see a single instance

+                       // of the "unable to connect" message on the bail() screen, if it appears.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( $this->reconnect_retries === $tries && WP_DEBUG ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                error_reporting( $error_reporting );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1852,7 +1852,8 @@

<span class="cx" style="display: block; padding: 0 10px">                // We weren't able to reconnect, so we better bail.

</span><span class="cx" style="display: block; padding: 0 10px">                $this->bail( $message, 'db_connect_fail' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Call dead_db() if bail didn't die, because this database is no more. It has ceased to be (at least temporarily).

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Call dead_db() if bail didn't die, because this database is no more.

+               // It has ceased to be (at least temporarily).

</ins><span class="cx" style="display: block; padding: 0 10px">                 dead_db();

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1887,7 +1888,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->flush();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Log how the function was called

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Log how the function was called.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->func_call = "\$db->query(\"$query\")";

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // If we're writing to the database, make sure the query will write safely.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1971,7 +1972,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        } else {

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->rows_affected = mysql_affected_rows( $this->dbh );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Take note of the insert_id

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Take note of the insert_id.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( preg_match( '/^\s*(insert|replace)\s/i', $query ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( $this->use_mysqli ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        $this->insert_id = mysqli_insert_id( $this->dbh );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1979,7 +1980,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        $this->insert_id = mysql_insert_id( $this->dbh );

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</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 number of rows affected

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Return number of rows affected.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $return_val = $this->rows_affected;

</span><span class="cx" style="display: block; padding: 0 10px">                } else {

</span><span class="cx" style="display: block; padding: 0 10px">                        $num_rows = 0;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1996,7 +1997,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">                        // Log number of rows the query returned

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // and return number of rows selected

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // and return number of rows selected.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->num_rows = $num_rows;

</span><span class="cx" style="display: block; padding: 0 10px">                        $return_val     = $num_rows;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2528,12 +2529,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->query( $query );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Extract var out of cached results based x,y vals

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Extract var out of cached results based x,y vals.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! empty( $this->last_result[ $y ] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $values = array_values( get_object_vars( $this->last_result[ $y ] ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If there is a value return it else return null

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If there is a value return it else return null.

</ins><span class="cx" style="display: block; padding: 0 10px">                 return ( isset( $values[ $x ] ) && $values[ $x ] !== '' ) ? $values[ $x ] : null;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2574,7 +2575,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                } elseif ( $output == ARRAY_N ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return $this->last_result[ $y ] ? array_values( get_object_vars( $this->last_result[ $y ] ) ) : null;

</span><span class="cx" style="display: block; padding: 0 10px">                } elseif ( strtoupper( $output ) === OBJECT ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Back compat for OBJECT being previously case insensitive.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Back compat for OBJECT being previously case-insensitive.

</ins><span class="cx" style="display: block; padding: 0 10px">                         return $this->last_result[ $y ] ? $this->last_result[ $y ] : null;

</span><span class="cx" style="display: block; padding: 0 10px">                } else {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->print_error( ' $db->get_row(string query, output type, int offset) -- Output type must be one of: OBJECT, ARRAY_A, ARRAY_N' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2604,7 +2605,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">                $new_array = array();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Extract the column values

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Extract the column values.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $this->last_result ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        for ( $i = 0, $j = count( $this->last_result ); $i < $j; $i++ ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $new_array[ $i ] = $this->get_var( null, $x, $i );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2643,11 +2644,11 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $new_array = array();

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $output == OBJECT ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Return an integer-keyed array of row objects

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Return an integer-keyed array of row objects.

</ins><span class="cx" style="display: block; padding: 0 10px">                         return $this->last_result;

</span><span class="cx" style="display: block; padding: 0 10px">                } elseif ( $output == OBJECT_K ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Return an array of row objects with keys from column 1

-                       // (Duplicates are discarded)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Return an array of row objects with keys from column 1.

+                       // (Duplicates are discarded.)

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( $this->last_result ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                foreach ( $this->last_result as $row ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        $var_by_ref = get_object_vars( $row );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2663,10 +2664,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( $this->last_result ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                foreach ( (array) $this->last_result as $row ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        if ( $output == ARRAY_N ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                // ...integer-keyed row arrays

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         // ...integer-keyed row arrays.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                 $new_array[] = array_values( get_object_vars( $row ) );

</span><span class="cx" style="display: block; padding: 0 10px">                                        } else {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                // ...column name-keyed row arrays

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         // ...column name-keyed row arrays.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                 $new_array[] = get_object_vars( $row );

</span><span class="cx" style="display: block; padding: 0 10px">                                        }

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2673,7 +2674,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                        return $new_array;

</span><span class="cx" style="display: block; padding: 0 10px">                } elseif ( strtoupper( $output ) === OBJECT ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Back compat for OBJECT being previously case insensitive.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Back compat for OBJECT being previously case-insensitive.

</ins><span class="cx" style="display: block; padding: 0 10px">                         return $this->last_result;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">                return null;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3037,9 +3038,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                $truncate_by_byte_length = 'byte' === $value['length']['type'];

</span><span class="cx" style="display: block; padding: 0 10px">                        } else {

</span><span class="cx" style="display: block; padding: 0 10px">                                $length = false;

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Since we have no length, we'll never truncate.

-                               // Initialize the variable to false. true would take us

-                               // through an unnecessary (for this case) codepath below.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         /*

+                                * Since we have no length, we'll never truncate.

+                                * Initialize the variable to false. true would take us

+                                * through an unnecessary (for this case) codepath below.

+                                */

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $truncate_by_byte_length = 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">@@ -3195,7 +3198,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                return $charset;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // We can't reliably strip text from tables containing binary/blob columns

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // We can't reliably strip text from tables containing binary/blob columns.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( 'binary' === $charset ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                return $query;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3296,11 +3299,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        return $maybe[2];

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // SHOW TABLE STATUS LIKE and SHOW TABLES LIKE 'wp\_123\_%'

-               // This quoted LIKE operand seldom holds a full table name.

-               // It is usually a pattern for matching a prefix so we just

-               // strip the trailing % and unescape the _ to get 'wp_123_'

-               // which drop-ins can use for routing these SQL statements.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /*

+                * SHOW TABLE STATUS LIKE and SHOW TABLES LIKE 'wp\_123\_%'

+                * This quoted LIKE operand seldom holds a full table name.

+                * It is usually a pattern for matching a prefix so we just

+                * strip the trailing % and unescape the _ to get 'wp_123_'

+                * which drop-ins can use for routing these SQL statements.

+                */

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( preg_match( '/^\s*SHOW\s+(?:TABLE\s+STATUS|(?:FULL\s+)?TABLES)\s+(?:WHERE\s+Name\s+)?LIKE\s*("|\')((?:[\\\\0-9a-zA-Z$_.-]|[\xC2-\xDF][\x80-\xBF])+)%?\\1/is', $query, $maybe ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return str_replace( '\\_', '_', $maybe[2] );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3490,7 +3495,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function check_database_version() {

</span><span class="cx" style="display: block; padding: 0 10px">                global $wp_version, $required_mysql_version;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make sure the server has the required MySQL version

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure the server has the required MySQL version.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( version_compare( $this->db_version(), $required_mysql_version, '<' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        /* translators: 1: WordPress version number, 2: Minimum required MySQL version number. */

</span><span class="cx" style="display: block; padding: 0 10px">                        return new WP_Error( 'database_version', sprintf( __( '<strong>ERROR</strong>: WordPress %1$s requires MySQL %2$s or higher' ), $wp_version, $required_mysql_version ) );

</span></span></pre></div>

<a id="trunksrcwploadphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-load.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-load.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-load.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,7 +43,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> } else {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // A config file doesn't exist

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // A config file doesn't exist.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        define( 'WPINC', 'wp-includes' );

</span><span class="cx" style="display: block; padding: 0 10px">        require_once( ABSPATH . WPINC . '/load.php' );

</span></span></pre></div>

<a id="trunksrcwploginphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-login.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-login.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-login.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,7 +41,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> function login_header( $title = 'Log In', $message = '', $wp_error = null ) {

</span><span class="cx" style="display: block; padding: 0 10px">        global $error, $interim_login, $action;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Don't index any of these forms

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Don't index any of these forms.

</ins><span class="cx" style="display: block; padding: 0 10px">         add_action( 'login_head', 'wp_sensitive_page_meta' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        add_action( 'login_head', 'wp_login_viewport_meta' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -268,7 +268,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        echo '<p class="message">' . apply_filters( 'login_messages', $messages ) . "</p>\n";

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-} // End of login_header()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+} // End of login_header().

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> /**

<span class="cx" style="display: block; padding: 0 10px">  * Outputs the footer for the login page.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -300,7 +300,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">-        </div><?php // End of <div id="login"> ?>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ </div><?php // End of <div id="login">. ?>

</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"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -507,7 +507,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> header( 'Content-Type: ' . get_bloginfo( 'html_type' ) . '; charset=' . get_bloginfo( 'charset' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( defined( 'RELOCATE' ) && RELOCATE ) { // Move flag is set

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( defined( 'RELOCATE' ) && RELOCATE ) { // Move flag is set.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( isset( $_SERVER['PATH_INFO'] ) && ( $_SERVER['PATH_INFO'] !== $_SERVER['PHP_SELF'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $_SERVER['PHP_SELF'] = str_replace( $_SERVER['PATH_INFO'], '', $_SERVER['PHP_SELF'] );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -519,7 +519,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"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-//Set a cookie now to see if they are supported by the browser.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Set a cookie now to see if they are supported by the browser.

</ins><span class="cx" style="display: block; padding: 0 10px"> $secure = ( 'https' === parse_url( wp_login_url(), PHP_URL_SCHEME ) );

</span><span class="cx" style="display: block; padding: 0 10px"> setcookie( TEST_COOKIE, 'WP Cookie check', 0, COOKIEPATH, COOKIE_DOMAIN, $secure );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -560,9 +560,11 @@

</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $action ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        case 'confirm_admin_email':

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Note that `is_user_logged_in()` will return false immediately after logging in

-               // as the current user is not set, see wp-includes/pluggable.php.

-               // However this action runs on a redirect after logging in.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /*

+                * Note that `is_user_logged_in()` will return false immediately after logging in

+                * as the current user is not set, see wp-includes/pluggable.php.

+                * However this action runs on a redirect after logging in.

+                */

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! is_user_logged_in() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        wp_safe_redirect( wp_login_url() );

</span><span class="cx" style="display: block; padding: 0 10px">                        exit;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1210,7 +1212,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        )

</span><span class="cx" style="display: block; padding: 0 10px">                                );

</span><span class="cx" style="display: block; padding: 0 10px">                        } elseif ( isset( $_POST['testcookie'] ) && empty( $_COOKIE[ TEST_COOKIE ] ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // If cookies are disabled we can't log in even with a valid user+pass

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // If cookies are disabled, we can't log in even with a valid user and password.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $user = new WP_Error(

</span><span class="cx" style="display: block; padding: 0 10px">                                        'test_cookie',

</span><span class="cx" style="display: block; padding: 0 10px">                                        sprintf(

</span></span></pre></div>

<a id="trunksrcwpmailphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-mail.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-mail.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-mail.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,7 +33,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> /** Only check at this interval for new messages. */

</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! defined( 'WP_MAIL_INTERVAL' ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        define( 'WP_MAIL_INTERVAL', 300 ); // 5 minutes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ define( 'WP_MAIL_INTERVAL', 5 * MINUTE_IN_SECONDS );

</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"> $last_checked = get_transient( 'mailserver_last_checked' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -109,7 +109,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( preg_match( '/Subject: /i', $line ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $subject = trim( $line );

</span><span class="cx" style="display: block; padding: 0 10px">                                $subject = substr( $subject, 9, strlen( $subject ) - 9 );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Captures any text in the subject before $phone_delim as the subject

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Captures any text in the subject before $phone_delim as the subject.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( function_exists( 'iconv_mime_decode' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        $subject = iconv_mime_decode( $subject, 2, get_option( 'blog_charset' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                                } else {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -141,9 +141,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( preg_match( '/Date: /i', $line ) ) { // of the form '20 Mar 2002 20:32:37 +0100'

-                               $ddate           = str_replace( 'Date: ', '', trim( $line ) );

-                               $ddate           = preg_replace( '!\s*\(.+\)\s*$!', '', $ddate ); // remove parenthesised timezone string if it exists, as this confuses strtotime

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 if ( preg_match( '/Date: /i', $line ) ) { // Of the form '20 Mar 2002 20:32:37 +0100'.

+                               $ddate = str_replace( 'Date: ', '', trim( $line ) );

+                               // Remove parenthesised timezone string if it exists, as this confuses strtotime().

+                               $ddate           = preg_replace( '!\s*\(.+\)\s*$!', '', $ddate );

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $ddate_timestamp = strtotime( $ddate );

</span><span class="cx" style="display: block; padding: 0 10px">                                $post_date       = gmdate( 'Y-m-d H:i:s', $ddate_timestamp + $time_difference );

</span><span class="cx" style="display: block; padding: 0 10px">                                $post_date_gmt   = gmdate( 'Y-m-d H:i:s', $ddate_timestamp );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -151,7 +152,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">-        // Set $post_status based on $author_found and on author's publish_posts capability

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Set $post_status based on $author_found and on author's publish_posts capability.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( $author_found ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $user        = new WP_User( $post_author );

</span><span class="cx" style="display: block; padding: 0 10px">                $post_status = ( $user->has_cap( 'publish_posts' ) ) ? 'publish' : 'pending';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -195,7 +196,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $content = iconv( $charset, get_option( 'blog_charset' ), $content );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Captures any text in the body after $phone_delim as the body

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Captures any text in the body after $phone_delim as the body.

</ins><span class="cx" style="display: block; padding: 0 10px">         $content = explode( $phone_delim, $content );

</span><span class="cx" style="display: block; padding: 0 10px">        $content = empty( $content[1] ) ? $content[0] : $content[1];

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunksrcwpsettingsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-settings.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-settings.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-settings.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -87,7 +87,7 @@

<span class="cx" style="display: block; padding: 0 10px">        // For an advanced caching plugin to use. Uses a static drop-in because you would only want one.

</span><span class="cx" style="display: block; padding: 0 10px">        include( WP_CONTENT_DIR . '/advanced-cache.php' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Re-initialize any hooks added manually by advanced-cache.php

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Re-initialize any hooks added manually by advanced-cache.php.

</ins><span class="cx" style="display: block; padding: 0 10px">         if ( $wp_filter ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_filter = WP_Hook::build_preinitialized_hooks( $wp_filter );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -330,7 +330,7 @@

<span class="cx" style="display: block; padding: 0 10px"> // Define constants after multisite is loaded.

</span><span class="cx" style="display: block; padding: 0 10px"> wp_cookie_constants();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Define and enforce our SSL constants

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Define and enforce our SSL constants.

</ins><span class="cx" style="display: block; padding: 0 10px"> wp_ssl_constants();

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px"> // Create common globals.

</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"> 

</span><span class="cx" style="display: block; padding: 0 10px"> wp_start_scraping_edited_file_errors();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Register the default theme directory root

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Register the default theme directory root.

</ins><span class="cx" style="display: block; padding: 0 10px"> register_theme_directory( get_theme_root() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -397,7 +397,7 @@

<span class="cx" style="display: block; padding: 0 10px"> // Define constants which affect functionality if not already defined.

</span><span class="cx" style="display: block; padding: 0 10px"> wp_functionality_constants();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Add magic quotes and set up $_REQUEST ( $_GET + $_POST )

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Add magic quotes and set up $_REQUEST ( $_GET + $_POST ).

</ins><span class="cx" style="display: block; padding: 0 10px"> wp_magic_quotes();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -525,7 +525,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'init' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Check site status

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Check site status.

</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() ) {

</span><span class="cx" style="display: block; padding: 0 10px">        $file = ms_site_check();

</span><span class="cx" style="display: block; padding: 0 10px">        if ( true !== $file ) {

</span></span></pre></div>

<a id="trunksrcwpsignupphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-signup.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-signup.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/wp-signup.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,7 +39,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        die();

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Fix for page title

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Fix for page title.

</ins><span class="cx" style="display: block; padding: 0 10px"> $wp_query->is_404 = 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">@@ -139,7 +139,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">-        // Blog Title

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Site Title.

</ins><span class="cx" style="display: block; padding: 0 10px">         ?>

</span><span class="cx" style="display: block; padding: 0 10px">        <label for="blog_title"><?php _e( 'Site Title:' ); ?></label>

</span><span class="cx" style="display: block; padding: 0 10px">        <?php

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -253,7 +253,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $errors = new WP_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">-        // User name

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Username.

</ins><span class="cx" style="display: block; padding: 0 10px">         echo '<label for="user_name">' . __( 'Username:' ) . '</label>';

</span><span class="cx" style="display: block; padding: 0 10px">        $errmsg = $errors->get_error_message( 'user_name' );

</span><span class="cx" style="display: block; padding: 0 10px">        if ( $errmsg ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -887,7 +887,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        return array_intersect_assoc( $languages, get_available_languages() );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Main

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Main.

</ins><span class="cx" style="display: block; padding: 0 10px"> $active_signup = get_site_option( 'registration', 'none' );

</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="trunksrcxmlrpcphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/xmlrpc.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/xmlrpc.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/src/xmlrpc.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,7 +21,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $HTTP_RAW_POST_DATA = file_get_contents( 'php://input' );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// fix for mozBlog and other cases where '<?xml' isn't on the very first line

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Fix for mozBlog and other cases where '<?xml' isn't on the very first line.

</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $HTTP_RAW_POST_DATA ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">        $HTTP_RAW_POST_DATA = trim( $HTTP_RAW_POST_DATA );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,7 +82,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> $wp_xmlrpc_server_class = apply_filters( 'wp_xmlrpc_server_class', 'wp_xmlrpc_server' );

</span><span class="cx" style="display: block; padding: 0 10px"> $wp_xmlrpc_server       = new $wp_xmlrpc_server_class;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Fire off the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Fire off the request.

</ins><span class="cx" style="display: block; padding: 0 10px"> $wp_xmlrpc_server->serve_request();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> exit;

</span></span></pre></div>

<a id="trunktestsphpunitdataWPHTTPtestcaseredirectionscriptphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/data/WPHTTP-testcase-redirection-script.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/data/WPHTTP-testcase-redirection-script.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/data/WPHTTP-testcase-redirection-script.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,6 @@

</span><span class="cx" style="display: block; padding: 0 10px"> <?php

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Thanks WordPress..

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Thanks WordPress...

</ins><span class="cx" style="display: block; padding: 0 10px"> function is_ssl() {

</span><span class="cx" style="display: block; padding: 0 10px">        if ( isset($_SERVER['HTTPS']) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( 'on' == strtolower($_SERVER['HTTPS']) )

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,7 +73,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                echo 'PASS';

</span><span class="cx" style="display: block; padding: 0 10px">                exit;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Redirection was followed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Redirection was followed.

</ins><span class="cx" style="display: block; padding: 0 10px">         echo 'FAIL';

</span><span class="cx" style="display: block; padding: 0 10px">        exit;

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span></span></pre></div>

<a id="trunktestsphpunitdataformattingwholepostsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/data/formatting/whole-posts.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/data/formatting/whole-posts.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/data/formatting/whole-posts.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -55,7 +55,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">  

</span><span class="cx" style="display: block; padding: 0 10px"> /* DIVIDER */

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// based on https://core.trac.wordpress.org/attachment/ticket/29557/ChatTranscript.txt

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Based on https://core.trac.wordpress.org/attachment/ticket/29557/ChatTranscript.txt

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px"> array('hello!-- world. [caption arg1="Aenean consectetur ipsum ante, vel egestas enim tincidunt quis. Pellentesque vitae congue neque, vel mattis ante. In vitae tempus nunc. Etiam adipiscing enim sed condimentum ultrices. Aenean consectetur ipsum ante, vel egestas enim tincidunt qu. In vitae tempus nunc. In vitaentbnbsdgsdsdgsdhsdhdsdhdsh Aenean consectetur ipsum ante, vel egestas enim tincidunt quis. Pellentesque vitae congue neque, vel mattis ante. In vitae tempus nunc. Etiam adipiscing enim sed condimentum ultrices. Aenean consectetur ipsum ante, vel egestas enim tincidunt qu. In vitae tempus nunc. In vitaentbnbsdgsdsdgsdhsdhdsdhdsh" /] hello world.

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunktestsphpunitdatathemedir1camelCaseindexphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/data/themedir1/camelCase/index.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/data/themedir1/camelCase/index.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/data/themedir1/camelCase/index.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,5 @@

</span><span class="cx" style="display: block; padding: 0 10px"> <?php

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// dummy theme

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Dummy theme.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> echo dirname(__FILE__).'/'.basename(__FILE__);

</span></span></pre></div>

<a id="trunktestsphpunitdatathemedir1defaultcommentsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/data/themedir1/default/comments.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/data/themedir1/default/comments.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/data/themedir1/default/comments.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,4 +1,4 @@

</span><span class="cx" style="display: block; padding: 0 10px"> <?php

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Minimal comment template

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Minimal comment template.

</ins><span class="cx" style="display: block; padding: 0 10px"> wp_list_comments();

</span></span></pre></div>

<a id="trunktestsphpunitdatathemedir1defaultfunctionsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/data/themedir1/default/functions.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/data/themedir1/default/functions.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/data/themedir1/default/functions.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,6 @@

</span><span class="cx" style="display: block; padding: 0 10px"> <?php

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Minimum functions.php to pass unit tests

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Minimum functions.php to pass unit tests.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> function default_widgets_init() {

</span><span class="cx" style="display: block; padding: 0 10px">        register_sidebar( array( 'id' => 'sidebar-1' ) );

</span></span></pre></div>

<a id="trunktestsphpunitdatathemedir1pagetemplatesindexphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/data/themedir1/page-templates/index.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/data/themedir1/page-templates/index.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/data/themedir1/page-templates/index.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,3 +1,3 @@

</span><span class="cx" style="display: block; padding: 0 10px"> <?php

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Intentionally left blank

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Intentionally left blank.

</ins><span class="cx" style="display: block; padding: 0 10px"> ?>

</span><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file

</span></span></pre></div>

<a id="trunktestsphpunitdatathemedir1sandboxfunctionsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/data/themedir1/sandbox/functions.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/data/themedir1/sandbox/functions.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/data/themedir1/sandbox/functions.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,6 @@

</span><span class="cx" style="display: block; padding: 0 10px"> <?php

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// dummy theme

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Dummy theme.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> echo dirname(__FILE__).'/'.basename(__FILE__);

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunktestsphpunitdatathemedir1sandboxindexphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/data/themedir1/sandbox/index.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/data/themedir1/sandbox/index.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/data/themedir1/sandbox/index.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,6 @@

</span><span class="cx" style="display: block; padding: 0 10px"> <?php

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// dummy theme

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Dummy theme.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> echo dirname(__FILE__).'/'.basename(__FILE__);

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunktestsphpunitdatathemedir1theme1functionsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/data/themedir1/theme1/functions.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/data/themedir1/theme1/functions.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/data/themedir1/theme1/functions.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,6 @@

</span><span class="cx" style="display: block; padding: 0 10px"> <?php

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// dummy theme

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Dummy theme.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> echo dirname(__FILE__).'/'.basename(__FILE__);

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunktestsphpunitdatathemedir1theme1indexphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/data/themedir1/theme1/index.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/data/themedir1/theme1/index.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/data/themedir1/theme1/index.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,6 @@

</span><span class="cx" style="display: block; padding: 0 10px"> <?php

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// dummy theme

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Dummy theme.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> echo dirname(__FILE__).'/'.basename(__FILE__);

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunktestsphpunitdatathemedir1theme1dupefunctionsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/data/themedir1/theme1-dupe/functions.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/data/themedir1/theme1-dupe/functions.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/data/themedir1/theme1-dupe/functions.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,6 @@

</span><span class="cx" style="display: block; padding: 0 10px"> <?php

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// dummy theme

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Dummy theme.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> echo dirname(__FILE__).'/'.basename(__FILE__);

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunktestsphpunitdatathemedir1theme1dupeindexphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/data/themedir1/theme1-dupe/index.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/data/themedir1/theme1-dupe/index.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/data/themedir1/theme1-dupe/index.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,6 @@

</span><span class="cx" style="display: block; padding: 0 10px"> <?php

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// dummy theme

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Dummy theme.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> echo dirname(__FILE__).'/'.basename(__FILE__);

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunktestsphpunitincludesabstracttestcasephp"></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/abstract-testcase.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/abstract-testcase.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/includes/abstract-testcase.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -499,7 +499,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $errors[] = "Unexpected incorrect usage notice for $unexpected";

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Perform an assertion, but only if there are expected or unexpected deprecated calls or wrongdoings

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Perform an assertion, but only if there are expected or unexpected deprecated calls or wrongdoings.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! empty( $this->expected_deprecated ) ||

</span><span class="cx" style="display: block; padding: 0 10px">                        ! empty( $this->expected_doing_it_wrong ) ||

</span><span class="cx" style="display: block; padding: 0 10px">                        ! empty( $this->caught_deprecated ) ||

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -727,9 +727,11 @@

<span class="cx" style="display: block; padding: 0 10px">         * @param string $url The URL for the request.

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function go_to( $url ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // note: the WP and WP_Query classes like to silently fetch parameters

-               // from all over the place (globals, GET, etc), which makes it tricky

-               // to run them more than once without very carefully clearing everything

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /*

+                * Note: the WP and WP_Query classes like to silently fetch parameters

+                * from all over the place (globals, GET, etc), which makes it tricky

+                * to run them more than once without very carefully clearing everything.

+                */

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_GET  = array();

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST = array();

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( array( 'query_string', 'id', 'postdata', 'authordata', 'day', 'currentmonth', 'page', 'pages', 'multipage', 'more', 'numpages', 'pagenow', 'current_screen' ) as $v ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -742,7 +744,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $req = isset( $parts['path'] ) ? $parts['path'] : '';

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( isset( $parts['query'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $req .= '?' . $parts['query'];

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // parse the url query vars into $_GET

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Parse the URL query vars into $_GET.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 parse_str( $parts['query'], $_GET );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                } else {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -777,8 +779,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

<span class="cx" style="display: block; padding: 0 10px">         * This is a custom extension of the PHPUnit requirements handling.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Contains legacy code for skipping tests that are associated with an open Trac ticket. Core tests no longer

-        * support this behaviour.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Contains legacy code for skipping tests that are associated with an open Trac ticket.

+        * Core tests no longer support this behaviour.

</ins><span class="cx" style="display: block; padding: 0 10px">          *

</span><span class="cx" style="display: block; padding: 0 10px">         * @since 3.5.0

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -805,7 +807,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"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Core tests no longer check against open Trac tickets, but others using WP_UnitTestCase may do so.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Core tests no longer check against open Trac tickets,

+               // but others using WP_UnitTestCase may do so.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( defined( 'WP_RUN_CORE_TESTS' ) && WP_RUN_CORE_TESTS ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span></span></pre></div>

<a id="trunktestsphpunitincludesbootstrapphp"></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/bootstrap.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/bootstrap.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/includes/bootstrap.php  2020-01-29 00:43:23 UTC (rev 47122)

</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"> $multisite = $multisite || ( defined( 'WP_TESTS_MULTISITE' ) && WP_TESTS_MULTISITE );

</span><span class="cx" style="display: block; padding: 0 10px"> $multisite = $multisite || ( defined( 'MULTISITE' ) && MULTISITE );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Override the PHPMailer

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Override the PHPMailer.

</ins><span class="cx" style="display: block; padding: 0 10px"> require_once( dirname( __FILE__ ) . '/mock-mailer.php' );

</span><span class="cx" style="display: block; padding: 0 10px"> $phpmailer = new MockPHPMailer( true );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -114,13 +114,13 @@

</span><span class="cx" style="display: block; padding: 0 10px"> unset( $multisite );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['_wp_die_disabled'] = false;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Allow tests to override wp_die

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Allow tests to override wp_die().

</ins><span class="cx" style="display: block; padding: 0 10px"> tests_add_filter( 'wp_die_handler', '_wp_die_handler_filter' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Use the Spy REST Server instead of default

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Use the Spy REST Server instead of default.

</ins><span class="cx" style="display: block; padding: 0 10px"> tests_add_filter( 'wp_rest_server_class', '_wp_rest_server_class_filter' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px"> // Preset WordPress options defined in bootstrap file.

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Used to activate themes, plugins, as well as  other settings.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Used to activate themes, plugins, as well as other settings.

</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $GLOBALS['wp_tests_options'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">        function wp_tests_options( $value ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $key = substr( current_filter(), strlen( 'pre_option_' ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -132,10 +132,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Load WordPress

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Load WordPress.

</ins><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . '/wp-settings.php';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Delete any default posts & related data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Delete any default posts & related data.

</ins><span class="cx" style="display: block; padding: 0 10px"> _delete_all_posts();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> if ( version_compare( tests_get_phpunit_version(), '7.0', '>=' ) ) {

</span></span></pre></div>

<a id="trunktestsphpunitincludesfactoryclasswpunittestfactoryforattachmentphp"></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/factory/class-wp-unittest-factory-for-attachment.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/factory/class-wp-unittest-factory-for-attachment.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/includes/factory/class-wp-unittest-factory-for-attachment.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,7 +67,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'guid'           => $upload['url'],

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Save the data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Save the data.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $id = wp_insert_attachment( $attachment, $upload['file'], $parent );

</span><span class="cx" style="display: block; padding: 0 10px">                wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $upload['file'] ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunktestsphpunitincludesfunctionsphp"></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/functions.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/functions.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/includes/functions.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -161,7 +161,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! $GLOBALS['_wp_die_disabled'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                _wp_die_handler_txt( $message, $title, $args );

</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">-                //Ignore at our peril

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Ignore at our peril.

</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">@@ -285,7 +285,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"> // Skip `setcookie` calls in auth_cookie functions due to warning:

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Cannot modify header information - headers already sent by ...

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Cannot modify header information - headers already sent by...

</ins><span class="cx" style="display: block; padding: 0 10px"> tests_add_filter( 'send_auth_cookies', '__return_false' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> /**

</span></span></pre></div>

<a id="trunktestsphpunitincludesinstallphp"></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/install.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/install.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/includes/install.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,7 +31,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . '/wp-admin/includes/upgrade.php';

</span><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . '/wp-includes/wp-db.php';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Override the PHPMailer

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Override the PHPMailer.

</ins><span class="cx" style="display: block; padding: 0 10px"> global $phpmailer;

</span><span class="cx" style="display: block; padding: 0 10px"> require_once( dirname( __FILE__ ) . '/mock-mailer.php' );

</span><span class="cx" style="display: block; padding: 0 10px"> $phpmailer = new MockPHPMailer();

</span></span></pre></div>

<a id="trunktestsphpunitincludesmockfsphp"></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/mock-fs.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/mock-fs.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/includes/mock-fs.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,8 +5,8 @@

<span class="cx" style="display: block; padding: 0 10px">        // Holds a array of objects which contain an array of objects, etc.

</span><span class="cx" style="display: block; padding: 0 10px">        private $fs = null;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Holds a array of /path/to/file.php and /path/to/dir/ map to an object in $fs above

-       // a fast more efficient way of determining if a path exists, and access to that node

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Holds a array of /path/to/file.php and /path/to/dir/ map to an object in $fs above.

+       // A fast, more efficient way of determining if a path exists, and access to that node.

</ins><span class="cx" style="display: block; padding: 0 10px">         private $fs_map = array();

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">        public $verbose = false; // Enable to debug WP_Filesystem_Base::find_folder() / etc.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,7 +26,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">                $folder = $this->find_folder( $path );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Perhaps the FTP folder is rooted at the WordPress installation, Check for wp-includes folder in root, Could have some false positives, but rare.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Perhaps the FTP folder is rooted at the WordPress installation.

+               // Check for wp-includes folder in root, could have some false positives, but rare.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! $folder && $this->is_dir( '/wp-includes' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $folder = '/';

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,7 +34,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                return $folder;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Mock FS specific functions:

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Mock FS-specific functions:

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Sets initial filesystem environment and/or clears the current environment.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,7 +45,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->fs_map = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        '/' => $this->fs,

</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->cache  = array(); // Used by find_folder() and friends

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->cache  = array(); // Used by find_folder() and friends.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->cwd    = isset( $this->fs_map[ $home_dir ] ) ? $this->fs_map[ $home_dir ] : '/';

</span><span class="cx" style="display: block; padding: 0 10px">                $this->setfs( $paths );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,15 +61,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $paths = array_filter( array_map( 'trim', $paths ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $paths as $path ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Allow for comments

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Allow for comments.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( '#' === $path[0] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                continue;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Directories

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Directories.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( '/' === $path[ strlen( $path ) - 1 ] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->mkdir( $path );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        } else { // Files (with dummy content for now)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 } else { // Files (with dummy content for now).

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $this->put_contents( $path, 'This is a test file' );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -209,8 +210,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"> class MockFS_Node {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        public $name; // The "name" of the entry, does not include a slash (exception, root)

-       public $type; // The type of the entry 'f' for file, 'd' for Directory

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public $name; // The "name" of the entry, does not include a slash (exception, root).

+       public $type; // The type of the entry 'f' for file, 'd' for directory.

</ins><span class="cx" style="display: block; padding: 0 10px">         public $path; // The full path to the entry.

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function __construct( $path ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -229,12 +230,12 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> class MockFS_Directory_Node extends MockFS_Node {

</span><span class="cx" style="display: block; padding: 0 10px">        public $type     = 'd';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        public $children = array(); // The child nodes of this directory

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public $children = array(); // The child nodes of this directory.

</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"> class MockFS_File_Node extends MockFS_Node {

</span><span class="cx" style="display: block; padding: 0 10px">        public $type     = 'f';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        public $contents = ''; // The contents of the file

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public $contents = ''; // The contents of the file.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function __construct( $path, $contents = '' ) {

</span><span class="cx" style="display: block; padding: 0 10px">                parent::__construct( $path );

</span></span></pre></div>

<a id="trunktestsphpunitincludesphpunit7speedtraplistenerphp"></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/phpunit7/speed-trap-listener.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/phpunit7/speed-trap-listener.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/includes/phpunit7/speed-trap-listener.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -154,7 +154,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->suites--;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( 0 === $this->suites && $this->hasSlowTests() ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        arsort( $this->slow ); // Sort longest running tests to the top

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 arsort( $this->slow ); // Sort longest running tests to the top.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->renderHeader();

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->renderBody();

</span></span></pre></div>

<a id="trunktestsphpunitincludesspeedtraplistenerphp"></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/speed-trap-listener.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/speed-trap-listener.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/includes/speed-trap-listener.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -154,7 +154,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->suites--;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( 0 === $this->suites && $this->hasSlowTests() ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        arsort( $this->slow ); // Sort longest running tests to the top

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 arsort( $this->slow ); // Sort longest running tests to the top.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->renderHeader();

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->renderBody();

</span></span></pre></div>

<a id="trunktestsphpunitincludestestcaseajaxphp"></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/testcase-ajax.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/testcase-ajax.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/includes/testcase-ajax.php      2020-01-29 00:43:23 UTC (rev 47122)

</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">                remove_action( 'admin_init', '_maybe_update_plugins' );

</span><span class="cx" style="display: block; padding: 0 10px">                remove_action( 'admin_init', '_maybe_update_themes' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Register the core actions

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Register the core actions.

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( array_merge( self::$_core_actions_get, self::$_core_actions_post ) as $action ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( function_exists( 'wp_ajax_' . str_replace( '-', '_', $action ) ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                add_action( 'wp_ajax_' . $action, 'wp_ajax_' . str_replace( '-', '_', $action ), 1 );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -143,14 +143,14 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                set_current_screen( 'ajax' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Clear logout cookies

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Clear logout cookies.

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_action( 'clear_auth_cookie', array( $this, 'logout' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Suppress warnings from "Cannot modify header information - headers already sent by"

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Suppress warnings from "Cannot modify header information - headers already sent by".

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_error_level = error_reporting();

</span><span class="cx" style="display: block; padding: 0 10px">                error_reporting( $this->_error_level & ~E_WARNING );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make some posts

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make some posts.

</ins><span class="cx" style="display: block; padding: 0 10px">                 self::factory()->post->create_many( 5 );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -251,20 +251,20 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        protected function _handleAjax( $action ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Start output buffering

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Start output buffering.

</ins><span class="cx" style="display: block; padding: 0 10px">                 ini_set( 'implicit_flush', false );

</span><span class="cx" style="display: block; padding: 0 10px">                ob_start();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Build the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Build the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_POST['action'] = $action;

</span><span class="cx" style="display: block; padding: 0 10px">                $_GET['action']  = $action;

</span><span class="cx" style="display: block; padding: 0 10px">                $_REQUEST        = array_merge( $_POST, $_GET );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Call the hooks

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Call the hooks.

</ins><span class="cx" style="display: block; padding: 0 10px">                 do_action( 'admin_init' );

</span><span class="cx" style="display: block; padding: 0 10px">                do_action( 'wp_ajax_' . $_REQUEST['action'], null );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Save the output

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Save the output.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $buffer = ob_get_clean();

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! empty( $buffer ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->_last_response = $buffer;

</span></span></pre></div>

<a id="trunktestsphpunitincludestestcasecanonicalphp"></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/testcase-canonical.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/testcase-canonical.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/includes/testcase-canonical.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -263,20 +263,20 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $can_url        = $this->get_canonical( $test_url );

</span><span class="cx" style="display: block; padding: 0 10px">                $parsed_can_url = parse_url( $can_url );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Just test the Path and Query if present

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Just test the path and query if present.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( isset( $expected['url'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $expected['url'], $parsed_can_url['path'] . ( ! empty( $parsed_can_url['query'] ) ? '?' . $parsed_can_url['query'] : '' ), $ticket_ref );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If the test data doesn't include expected query vars, then we're done here

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If the test data doesn't include expected query vars, then we're done here.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! isset( $expected['qv'] ) ) {

</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">-                // "make" that the request and check the query is correct

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // "make" that the request and check the query is correct.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->go_to( $can_url );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Are all query vars accounted for, And correct?

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Are all query vars accounted for, and correct?

</ins><span class="cx" style="display: block; padding: 0 10px">                 global $wp;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $query_vars = array_diff( $wp->query_vars, $wp->extra_query_vars );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -283,7 +283,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! empty( $parsed_can_url['query'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        parse_str( $parsed_can_url['query'], $_qv );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // $_qv should not contain any elements which are set in $query_vars already (ie. $_GET vars should not be present in the Rewrite)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // $_qv should not contain any elements which are set in $query_vars already

+                       // (i.e. $_GET vars should not be present in the Rewrite).

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertEquals( array(), array_intersect( $query_vars, $_qv ), 'Query vars are duplicated from the Rewrite into $_GET; ' . $ticket_ref );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $query_vars = array_merge( $query_vars, $_qv );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -305,7 +306,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $can_url = redirect_canonical( $test_url, false );

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! $can_url ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return $test_url; // No redirect will take place for this request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return $test_url; // No redirect will take place for 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">                return $can_url;

</span></span></pre></div>

<a id="trunktestsphpunitincludestestcaserestposttypecontrollerphp"></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/testcase-rest-post-type-controller.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/testcase-rest-post-type-controller.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/includes/testcase-rest-post-type-controller.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,7 +5,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        protected function check_post_data( $post, $data, $context, $links ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $post_type_obj = get_post_type_object( $post->post_type );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Standard fields

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Standard fields.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $post->ID, $data['id'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $post->post_name, $data['slug'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( get_permalink( $post->ID ), $data['link'] );

</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">                $this->assertEquals( mysql_to_rfc3339( $post->post_modified ), $data['modified'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // author

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Author.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( post_type_supports( $post->post_type, 'author' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $post->post_author, $data['author'] );

</span><span class="cx" style="display: block; padding: 0 10px">                } else {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,7 +32,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEmpty( $data['author'] );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // post_parent

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Post parent.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $post_type_obj->hierarchical ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertArrayHasKey( 'parent', $data );

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( $post->post_parent ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,7 +49,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertFalse( isset( $data['parent'] ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // page attributes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Page attributes.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $post_type_obj->hierarchical && post_type_supports( $post->post_type, 'page-attributes' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $post->menu_order, $data['menu_order'] );

</span><span class="cx" style="display: block; padding: 0 10px">                } else {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,7 +56,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertFalse( isset( $data['menu_order'] ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Comments

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Comments.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( post_type_supports( $post->post_type, 'comments' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $post->comment_status, $data['comment_status'] );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $post->ping_status, $data['ping_status'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -110,7 +110,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( post_type_supports( $post->post_type, 'editor' ) ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // TODO: apply content filter for more accurate testing.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // TODO: Apply content filter for more accurate testing.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( ! $post->post_password ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->assertEquals( wpautop( $post->post_content ), $data['content']['rendered'] );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -126,10 +126,10 @@

</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, 'excerpt' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( empty( $post->post_password ) ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // TODO: apply excerpt filter for more accurate testing.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // TODO: Apply excerpt filter for more accurate testing.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $this->assertEquals( wpautop( $post->post_excerpt ), $data['excerpt']['rendered'] );

</span><span class="cx" style="display: block; padding: 0 10px">                        } else {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // TODO: better testing for excerpts for password protected posts.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // TODO: Better testing for excerpts for password protected posts.

</ins><span class="cx" style="display: block; padding: 0 10px">                         }

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( 'edit' === $context ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->assertEquals( $post->post_excerpt, $data['excerpt']['raw'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -156,7 +156,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $terms, $data[ $taxonomy->rest_base ] );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // test links

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test links.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $links ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $links     = test_rest_expand_compact_links( $links );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -211,8 +211,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $all_data = $response->get_data();

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $all_data as $data ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $post = get_post( $data['id'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // as the links for the post are "response_links" format in the data array we have to pull them

-                       // out and parse them.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // As the links for the post are "response_links" format in the data array,

+                       // we have to pull them out and parse them.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $links = $data['_links'];

</span><span class="cx" style="display: block; padding: 0 10px">                        foreach ( $links as &$links_array ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                foreach ( $links_array as &$link ) {

</span></span></pre></div>

<a id="trunktestsphpunitincludestracphp"></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/trac.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/trac.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/includes/trac.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,7 +33,7 @@

<span class="cx" style="display: block; padding: 0 10px">                                        return true; // Assume the ticket is closed, which means it gets run.

</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">-                                $tickets = substr( $tickets, 2 ); // remove 'id' column header

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $tickets = substr( $tickets, 2 ); // Remove 'id' column header.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $tickets = trim( $tickets );

</span><span class="cx" style="display: block; padding: 0 10px">                                file_put_contents( $file, $tickets );

</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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/includes/utils.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,6 @@

</span><span class="cx" style="display: block; padding: 0 10px"> <?php

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// misc help functions and utilities

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Misc help functions and utilities.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> function rand_str( $len = 32 ) {

</span><span class="cx" style="display: block; padding: 0 10px">        return substr( md5( uniqid( rand() ) ), 0, $len );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,7 +18,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        return $string;

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// strip leading and trailing whitespace from each line in the string

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Strip leading and trailing whitespace from each line in the string.

</ins><span class="cx" style="display: block; padding: 0 10px"> function strip_ws( $txt ) {

</span><span class="cx" style="display: block; padding: 0 10px">        $lines  = explode( "\n", $txt );

</span><span class="cx" style="display: block; padding: 0 10px">        $result = array();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,10 +31,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">        return trim( join( "\n", $result ) );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// helper class for testing code that involves actions and filters

-// typical use:

-// $ma = new MockAction();

-// add_action('foo', array(&$ma, 'action'));

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/*

+ * Helper class for testing code that involves actions and filters.

+ * Typical use:

+ * $ma = new MockAction();

+ * add_action( 'foo', array( &$ma, 'action' ) );

+ */

</ins><span class="cx" style="display: block; padding: 0 10px"> class MockAction {

</span><span class="cx" style="display: block; padding: 0 10px">        var $events;

</span><span class="cx" style="display: block; padding: 0 10px">        var $debug;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -129,7 +131,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">        function filterall( $tag, ...$args ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // this one doesn't return the result, so it's safe to use with the new 'all' filter

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // This one doesn't return the result, so it's safe to use with the new 'all' filter.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $this->debug ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        dmp( __FUNCTION__, $this->current_filter() );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -141,12 +143,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // return a list of all the actions, tags and args

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Return a list of all the actions, tags and args.

</ins><span class="cx" style="display: block; padding: 0 10px">         function get_events() {

</span><span class="cx" style="display: block; padding: 0 10px">                return $this->events;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</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 a count of the number of times the action was called since the last reset

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Return a count of the number of times the action was called since the last reset.

</ins><span class="cx" style="display: block; padding: 0 10px">         function get_call_count( $tag = '' ) {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $tag ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $count = 0;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -160,7 +162,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                return count( $this->events );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</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 an array of the tags that triggered calls to this action

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Return an array of the tags that triggered calls to this action.

</ins><span class="cx" style="display: block; padding: 0 10px">         function get_tags() {

</span><span class="cx" style="display: block; padding: 0 10px">                $out = array();

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $this->events as $e ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -169,7 +171,7 @@

</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="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // return an array of args passed in calls to this action

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Return an array of args passed in calls to this action.

</ins><span class="cx" style="display: block; padding: 0 10px">         function get_args() {

</span><span class="cx" style="display: block; padding: 0 10px">                $out = array();

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $this->events as $e ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -179,8 +181,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// convert valid xml to an array tree structure

-// kinda lame but it works with a default php 4 installation

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Convert valid XML to an array tree structure.

+// Kinda lame, but it works with a default PHP 4 installation.

</ins><span class="cx" style="display: block; padding: 0 10px"> class TestXMLParser {

</span><span class="cx" style="display: block; padding: 0 10px">        var $xml;

</span><span class="cx" style="display: block; padding: 0 10px">        var $data = array();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -312,7 +314,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        return ob_get_clean();

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// recursively generate some quick assertEquals tests based on an array

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Recursively generate some quick assertEquals() tests based on an array.

</ins><span class="cx" style="display: block; padding: 0 10px"> function gen_tests_array( $name, $array ) {

</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -367,7 +369,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        echo "\n";

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// mask out any input fields matching the given name

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Mask out any input fields matching the given name.

</ins><span class="cx" style="display: block; padding: 0 10px"> function mask_input_value( $in, $name = '_wpnonce' ) {

</span><span class="cx" style="display: block; padding: 0 10px">        return preg_replace( '@<input([^>]*) name="' . preg_quote( $name ) . '"([^>]*) value="[^>]*" />@', '<input$1 name="' . preg_quote( $name ) . '"$2 value="***" />', $in );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -395,7 +397,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"> function _cleanup_query_vars() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // clean out globals to stop them polluting wp and wp_query

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Clean out globals to stop them polluting wp and wp_query.

</ins><span class="cx" style="display: block; padding: 0 10px">         foreach ( $GLOBALS['wp']->public_query_vars as $v ) {

</span><span class="cx" style="display: block; padding: 0 10px">                unset( $GLOBALS[ $v ] );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span></span></pre></div>

<a id="trunktestsphpunitincludeswpprofilerphp"></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/wp-profiler.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/wp-profiler.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/includes/wp-profiler.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,22 +1,21 @@

</span><span class="cx" style="display: block; padding: 0 10px"> <?php

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> /*

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-A simple manually-instrumented profiler for WordPress.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * A simple manually-instrumented profiler for WordPress.

+ *

+ * This records basic execution time, and a summary of the actions and SQL queries run within each block.

+ *

+ * start() and stop() must be called in pairs, for example:

+ *

+ * function something_to_profile() {

+ *     wppf_start(__FUNCTION__);

+ *     do_stuff();

+ *     wppf_stop();

+ * }

+ *

+ * Multiple profile blocks are permitted, and they may be nested.

+ */

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-This records basic execution time, and a summary of the actions and SQL queries run within each block.

-

-start() and stop() must be called in pairs, for example:

-

-function something_to_profile() {

-       wppf_start(__FUNCTION__);

-       do_stuff();

-       wppf_stop();

-}

-

-Multiple profile blocks are permitted, and they may be nested.

-

-*/

-

</del><span class="cx" style="display: block; padding: 0 10px"> class WPProfiler {

</span><span class="cx" style="display: block; padding: 0 10px">        public $stack;

</span><span class="cx" style="display: block; padding: 0 10px">        public $profile;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,11 +32,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $time = $this->microtime();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! $this->stack ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // log all actions and filters

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Log all actions and filters.

</ins><span class="cx" style="display: block; padding: 0 10px">                         add_filter( 'all', array( $this, 'log_filter' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // reset the wpdb queries log, storing it on the profile stack if necessary

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Reset the wpdb queries log, storing it on the profile stack if necessary.

</ins><span class="cx" style="display: block; padding: 0 10px">                 global $wpdb;

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $this->stack ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->stack[ count( $this->stack ) - 1 ]['queries'] = $wpdb->queries;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -151,7 +150,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">        public function _query_count( $queries ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // this requires the savequeries patch at https://core.trac.wordpress.org/ticket/5218

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // This requires the SAVEQUERIES patch at https://core.trac.wordpress.org/ticket/5218

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = array();

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $queries as $q ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( empty( $q[2] ) ) {

</span></span></pre></div>

<a id="trunktestsphpunitmultisitexml"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/multisite.xml</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/multisite.xml 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/multisite.xml   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,19 +9,19 @@

</span><span class="cx" style="display: block; padding: 0 10px">                <const name="WP_RUN_CORE_TESTS" value="1" />

</span><span class="cx" style="display: block; padding: 0 10px">        </php>

</span><span class="cx" style="display: block; padding: 0 10px">        <testsuites>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <!-- Default test suite to run all tests -->

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <!-- Default test suite to run all tests. -->

</ins><span class="cx" style="display: block; padding: 0 10px">                 <testsuite name="default">

</span><span class="cx" style="display: block; padding: 0 10px">                        <directory suffix=".php">tests</directory>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <!-- Path relative to the checkout root, for PHPUnit 3.6.x -->

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <!-- Path relative to the checkout root, for PHPUnit 3.6.x. -->

</ins><span class="cx" style="display: block; padding: 0 10px">                         <exclude>tests/phpunit/tests/rest-api/rest-autosaves-controller.php</exclude>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <!-- Same path relative to the configuration file, for PHPUnit 4.0.0+ -->

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <!-- Same path relative to the configuration file, for PHPUnit 4.0.0+. -->

</ins><span class="cx" style="display: block; padding: 0 10px">                         <exclude>tests/rest-api/rest-autosaves-controller.php</exclude>

</span><span class="cx" style="display: block; padding: 0 10px">                </testsuite>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <!-- Sets the DOING_AUTOSAVE constant, so needs to be run last -->

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <!-- Sets the DOING_AUTOSAVE constant, so needs to be run last. -->

</ins><span class="cx" style="display: block; padding: 0 10px">                 <testsuite name="restapi-autosave">

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <!-- Path relative to the checkout root, for PHPUnit 3.6.x -->

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <!-- Path relative to the checkout root, for PHPUnit 3.6.x. -->

</ins><span class="cx" style="display: block; padding: 0 10px">                         <file>tests/phpunit/tests/rest-api/rest-autosaves-controller.php</file>

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <!-- Same path relative to the configuration file, for PHPUnit 4.0.0+ -->

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <!-- Same path relative to the configuration file, for PHPUnit 4.0.0+. -->

</ins><span class="cx" style="display: block; padding: 0 10px">                         <file>tests/rest-api/rest-autosaves-controller.php</file>

</span><span class="cx" style="display: block; padding: 0 10px">                </testsuite>

</span><span class="cx" style="display: block; padding: 0 10px">        </testsuites>

</span></span></pre></div>

<a id="trunktestsphpunittestsactionsphp"></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/actions.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/actions.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/actions.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,9 +14,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                add_action( $tag, array( &$a, 'action' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                do_action( $tag );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // only one event occurred for the hook, with empty args

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Only one event occurred for the hook, with empty args.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 1, $a->get_call_count() );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // only our hook was called

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Only our hook was called.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( array( $tag ), $a->get_tags() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $argsvar = $a->get_args();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,11 +31,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                add_action( $tag, array( &$a, 'action' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                do_action( $tag );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // make sure our hook was called correctly

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure our hook was called correctly.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 1, $a->get_call_count() );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array( $tag ), $a->get_tags() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // now remove the action, do it again, and make sure it's not called this time

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Now remove the action, do it again, and make sure it's not called this time.

</ins><span class="cx" style="display: block; padding: 0 10px">                 remove_action( $tag, array( &$a, 'action' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                do_action( $tag );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 1, $a->get_call_count() );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,19 +57,19 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( has_action( $tag ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // one tag with multiple actions

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // One tag with multiple actions.

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_multiple_actions() {

</span><span class="cx" style="display: block; padding: 0 10px">                $a1  = new MockAction();

</span><span class="cx" style="display: block; padding: 0 10px">                $a2  = new MockAction();

</span><span class="cx" style="display: block; padding: 0 10px">                $tag = __FUNCTION__;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // add both actions to the hook

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Add both actions to the hook.

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_action( $tag, array( &$a1, 'action' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                add_action( $tag, array( &$a2, 'action' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                do_action( $tag );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // both actions called once each

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Both actions called once each.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 1, $a1->get_call_count() );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 1, $a2->get_call_count() );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,7 +80,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $val = __FUNCTION__ . '_val';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                add_action( $tag, array( &$a, 'action' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // call the action with a single argument

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Call the action with a single argument.

</ins><span class="cx" style="display: block; padding: 0 10px">                 do_action( $tag, $val );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $call_count = $a->get_call_count();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,19 +96,19 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $val1 = __FUNCTION__ . '_val1';

</span><span class="cx" style="display: block; padding: 0 10px">                $val2 = __FUNCTION__ . '_val2';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // a1 accepts two arguments, a2 doesn't

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // $a1 accepts two arguments, $a2 doesn't.

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_action( $tag, array( &$a1, 'action' ), 10, 2 );

</span><span class="cx" style="display: block; padding: 0 10px">                add_action( $tag, array( &$a2, 'action' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // call the action with two arguments

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Call the action with two arguments.

</ins><span class="cx" style="display: block; padding: 0 10px">                 do_action( $tag, $val1, $val2 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $call_count = $a1->get_call_count();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // a1 should be called with both args

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // $a1 should be called with both args.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 1, $call_count );

</span><span class="cx" style="display: block; padding: 0 10px">                $argsvar1 = $a1->get_args();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array( $val1, $val2 ), array_pop( $argsvar1 ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // a2 should be called with one only

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // $a2 should be called with one only.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 1, $a2->get_call_count() );

</span><span class="cx" style="display: block; padding: 0 10px">                $argsvar2 = $a2->get_args();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array( $val1 ), array_pop( $argsvar2 ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -129,25 +129,25 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $val1 = __FUNCTION__ . '_val1';

</span><span class="cx" style="display: block; padding: 0 10px">                $val2 = __FUNCTION__ . '_val2';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // a1 accepts two arguments, a2 doesn't, a3 accepts two arguments

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // $a1 accepts two arguments, $a2 doesn't, $a3 accepts two arguments.

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_action( $tag, array( &$a1, 'action' ), 10, 2 );

</span><span class="cx" style="display: block; padding: 0 10px">                add_action( $tag, array( &$a2, 'action' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                add_action( $tag, array( &$a3, 'action' ), 10, 2 );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // call the action with two arguments

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Call the action with two arguments.

</ins><span class="cx" style="display: block; padding: 0 10px">                 do_action( $tag, $val1, $val2 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $call_count = $a1->get_call_count();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // a1 should be called with both args

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // $a1 should be called with both args.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 1, $call_count );

</span><span class="cx" style="display: block; padding: 0 10px">                $argsvar1 = $a1->get_args();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array( $val1, $val2 ), array_pop( $argsvar1 ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // a2 should be called with one only

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // $a2 should be called with one only.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 1, $a2->get_call_count() );

</span><span class="cx" style="display: block; padding: 0 10px">                $argsvar2 = $a2->get_args();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array( $val1 ), array_pop( $argsvar2 ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // a3 should be called with both args

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // $a3 should be called with both args.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 1, $a3->get_call_count() );

</span><span class="cx" style="display: block; padding: 0 10px">                $argsvar3 = $a3->get_args();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array( $val1, $val2 ), array_pop( $argsvar3 ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -180,17 +180,17 @@

</span><span class="cx" style="display: block; padding: 0 10px">                add_action( $tag, array( &$a, 'action2' ), 9 );

</span><span class="cx" style="display: block; padding: 0 10px">                do_action( $tag );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // two events, one per action

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Two events, one per action.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 2, $a->get_call_count() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // action2 is called first because it has priority 9

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // 'action2' is called first because it has priority 9.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'action' => 'action2',

</span><span class="cx" style="display: block; padding: 0 10px">                                'tag'    => $tag,

</span><span class="cx" style="display: block; padding: 0 10px">                                'args'   => array( '' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // action 1 is called second

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // 'action' is called second.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'action' => 'action',

</span><span class="cx" style="display: block; padding: 0 10px">                                'tag'    => $tag,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -205,18 +205,18 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $tag1 = 'action1';

</span><span class="cx" style="display: block; padding: 0 10px">                $tag2 = 'action2';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // do action tag1 but not tag2

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Do action $tag1 but not $tag2.

</ins><span class="cx" style="display: block; padding: 0 10px">                 do_action( $tag1 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 1, did_action( $tag1 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 0, did_action( $tag2 ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // do action tag2 a random number of times

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Do action $tag2 a random number of times.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $count = rand( 0, 10 );

</span><span class="cx" style="display: block; padding: 0 10px">                for ( $i = 0; $i < $count; $i++ ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        do_action( $tag2 );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // tag1's count hasn't changed, tag2 should be correct

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // $tag1's count hasn't changed, $tag2 should be correct.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 1, did_action( $tag1 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $count, did_action( $tag2 ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -227,18 +227,18 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $tag1 = __FUNCTION__ . '_1';

</span><span class="cx" style="display: block; padding: 0 10px">                $tag2 = __FUNCTION__ . '_2';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // add an 'all' action

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Add an 'all' action.

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_action( 'all', array( &$a, 'action' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 10, has_filter( 'all', array( &$a, 'action' ) ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // do some actions

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Do some actions.

</ins><span class="cx" style="display: block; padding: 0 10px">                 do_action( $tag1 );

</span><span class="cx" style="display: block; padding: 0 10px">                do_action( $tag2 );

</span><span class="cx" style="display: block; padding: 0 10px">                do_action( $tag1 );

</span><span class="cx" style="display: block; padding: 0 10px">                do_action( $tag1 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // our action should have been called once for each tag

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Our action should have been called once for each tag.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 4, $a->get_call_count() );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // only our hook was called

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Only our hook was called.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( array( $tag1, $tag2, $tag1, $tag1 ), $a->get_tags() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                remove_action( 'all', array( &$a, 'action' ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -254,11 +254,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 10, has_filter( 'all', array( &$a, 'action' ) ) );

</span><span class="cx" style="display: block; padding: 0 10px">                do_action( $tag );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // make sure our hook was called correctly

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure our hook was called correctly.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 1, $a->get_call_count() );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array( $tag ), $a->get_tags() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // now remove the action, do it again, and make sure it's not called this time

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Now remove the action, do it again, and make sure it's not called this time.

</ins><span class="cx" style="display: block; padding: 0 10px">                 remove_action( 'all', array( &$a, 'action' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( has_filter( 'all', array( &$a, 'action' ) ) );

</span><span class="cx" style="display: block; padding: 0 10px">                do_action( $tag );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -277,7 +277,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $args = $a->get_args();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( $args[0][0], $obj );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // just in case we don't trust assertSame

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Just in case we don't trust assertSame().

</ins><span class="cx" style="display: block; padding: 0 10px">                 $obj->foo = true;

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( empty( $args[0][0]->foo ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -456,16 +456,16 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_doing_filter() {

</span><span class="cx" style="display: block; padding: 0 10px">                global $wp_current_filter;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $wp_current_filter = array(); // Set to an empty array first

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $wp_current_filter = array(); // Set to an empty array first.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertFalse( doing_filter() ); // No filter is passed in, and no filter is being processed

-               $this->assertFalse( doing_filter( 'testing' ) ); // Filter is passed in but not being processed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertFalse( doing_filter() );            // No filter is passed in, and no filter is being processed.

+               $this->assertFalse( doing_filter( 'testing' ) ); // Filter is passed in but not being processed.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_current_filter[] = 'testing';

</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->assertTrue( doing_filter() ); // No action is passed in, and a filter is being processed

-               $this->assertTrue( doing_filter( 'testing' ) ); // Filter is passed in and is being processed

-               $this->assertFalse( doing_filter( 'something_else' ) ); // Filter is passed in but not being processed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertTrue( doing_filter() );                    // No action is passed in, and a filter is being processed.

+               $this->assertTrue( doing_filter( 'testing' ) );         // Filter is passed in and is being processed.

+               $this->assertFalse( doing_filter( 'something_else' ) ); // Filter is passed in but not being processed.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_current_filter = array();

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -475,16 +475,16 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_doing_action() {

</span><span class="cx" style="display: block; padding: 0 10px">                global $wp_current_filter;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $wp_current_filter = array(); // Set to an empty array first

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $wp_current_filter = array(); // Set to an empty array first.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertFalse( doing_action() ); // No action is passed in, and no filter is being processed

-               $this->assertFalse( doing_action( 'testing' ) ); // Action is passed in but not being processed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertFalse( doing_action() );            // No action is passed in, and no filter is being processed.

+               $this->assertFalse( doing_action( 'testing' ) ); // Action is passed in but not being processed.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_current_filter[] = 'testing';

</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->assertTrue( doing_action() ); // No action is passed in, and a filter is being processed

-               $this->assertTrue( doing_action( 'testing' ) ); // Action is passed in and is being processed

-               $this->assertFalse( doing_action( 'something_else' ) ); // Action is passed in but not being processed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertTrue( doing_action() );                    // No action is passed in, and a filter is being processed.

+               $this->assertTrue( doing_action( 'testing' ) );         // Action is passed in and is being processed.

+               $this->assertFalse( doing_action( 'something_else' ) ); // Action is passed in but not being processed.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_current_filter = array();

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -493,8 +493,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 14994

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_doing_filter_real() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertFalse( doing_filter() ); // No filter is passed in, and no filter is being processed

-               $this->assertFalse( doing_filter( 'testing' ) ); // Filter is passed in but not being processed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertFalse( doing_filter() );            // No filter is passed in, and no filter is being processed.

+               $this->assertFalse( doing_filter( 'testing' ) ); // Filter is passed in but not being processed.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'testing', array( $this, 'apply_testing_filter' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( has_action( 'testing' ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -505,8 +505,8 @@

<span class="cx" style="display: block; padding: 0 10px">                // Make sure it ran.

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $this->apply_testing_filter );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertFalse( doing_filter() ); // No longer doing any filters

-               $this->assertFalse( doing_filter( 'testing' ) ); // No longer doing this filter

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertFalse( doing_filter() );            // No longer doing any filters.

+               $this->assertFalse( doing_filter( 'testing' ) ); // No longer doing this filter.

</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">        function apply_testing_filter() {

</span></span></pre></div>

<a id="trunktestsphpunittestsadminincludesListTablephp"></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/admin/includesListTable.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/admin/includesListTable.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/admin/includesListTable.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,9 +20,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        public static function wpSetUpBeforeClass( $factory ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // note that our top/children/grandchildren arrays are 1-indexed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Note that our top/children/grandchildren arrays are 1-indexed.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // create top level pages

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create top-level pages.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $num_posts = 5;

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( range( 1, $num_posts ) as $i ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $p = $factory->post->create_and_get(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,7 +36,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        self::$post_ids[] = $p->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">-                // create child pages

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create child pages.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $num_children = 3;

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( self::$top as $top => $top_page ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        foreach ( range( 1, $num_children ) as $i ) {

</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">-                // create grand-child pages for the third and fourth top-level pages

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create grand-child pages for the third and fourth top-level pages.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $num_grandchildren = 3;

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( range( 3, 4 ) as $top ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        foreach ( self::$children[ $top ] as $child => $child_page ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -144,7 +144,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 15459

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_grandchildren_hierarchical_pages_first_page() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // page 6 is the first page with grandchildren

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Page 6 is the first page with grandchildren.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_test_list_hierarchical_page(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'paged'          => 6,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -163,7 +163,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 15459

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_grandchildren_hierarchical_pages_second_page() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // page 7 is the second page with grandchildren

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Page 7 is the second page with grandchildren.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_test_list_hierarchical_page(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'paged'          => 7,

</span></span></pre></div>

<a id="trunktestsphpunittestsadminincludesMiscphp"></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/admin/includesMisc.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/admin/includesMisc.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/admin/includesMisc.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,17 +7,17 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_shorten_url() {

</span><span class="cx" style="display: block; padding: 0 10px">                $tests = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'wordpress\.org/about/philosophy'

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                => 'wordpress\.org/about/philosophy', // no longer strips slashes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         => 'wordpress\.org/about/philosophy',     // No longer strips slashes.

</ins><span class="cx" style="display: block; padding: 0 10px">                         'wordpress.org/about/philosophy'

</span><span class="cx" style="display: block; padding: 0 10px">                                => 'wordpress.org/about/philosophy',

</span><span class="cx" style="display: block; padding: 0 10px">                        'http://wordpress.org/about/philosophy/'

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                => 'wordpress.org/about/philosophy', // remove http, trailing slash

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         => 'wordpress.org/about/philosophy',      // Remove http, trailing slash.

</ins><span class="cx" style="display: block; padding: 0 10px">                         'http://www.wordpress.org/about/philosophy/'

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                => 'wordpress.org/about/philosophy', // remove http, www

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         => 'wordpress.org/about/philosophy',      // Remove http, www.

</ins><span class="cx" style="display: block; padding: 0 10px">                         'http://wordpress.org/about/philosophy/#box'

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                => 'wordpress.org/about/philosophy/#box', // don't shorten 35 characters

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         => 'wordpress.org/about/philosophy/#box',      // Don't shorten 35 characters.

</ins><span class="cx" style="display: block; padding: 0 10px">                         'http://wordpress.org/about/philosophy/#decisions'

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                => 'wordpress.org/about/philosophy/#&hellip;', // shorten to 32 if > 35 after cleaning

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         => 'wordpress.org/about/philosophy/#&hellip;', // Shorten to 32 if > 35 after cleaning.

</ins><span class="cx" style="display: block; padding: 0 10px">                 );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $tests as $k => $v ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $v, url_shorten( $k ) );

</span></span></pre></div>

<a id="trunktestsphpunittestsadminincludesPluginphp"></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/admin/includesPlugin.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/admin/includesPlugin.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/admin/includesPlugin.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,7 +32,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) );

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'siteurl', 'http://example.com' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // add some pages

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Add some pages.

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_options_page( 'Test Settings', 'Test Settings', 'manage_options', 'testsettings', 'mt_settings_page' );

</span><span class="cx" style="display: block; padding: 0 10px">                add_management_page( 'Test Tools', 'Test Tools', 'manage_options', 'testtools', 'mt_tools_page' );

</span><span class="cx" style="display: block; padding: 0 10px">                add_menu_page( 'Test Toplevel', 'Test Toplevel', 'manage_options', 'mt-top-level-handle', 'mt_toplevel_page' );

</span></span></pre></div>

<a id="trunktestsphpunittestsadminincludesPostphp"></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/admin/includesPost.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/admin/includesPost.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/admin/includesPost.php    2020-01-29 00:43:23 UTC (rev 47122)

</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">        function test__wp_translate_postdata_cap_checks_contributor() {

</span><span class="cx" style="display: block; padding: 0 10px">                wp_set_current_user( self::$contributor_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">-                // Create New Draft Post

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create new draft post.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_post_data                = array();

</span><span class="cx" style="display: block; padding: 0 10px">                $_post_data['post_author'] = self::$contributor_id;

</span><span class="cx" style="display: block; padding: 0 10px">                $_post_data['post_type']   = 'post';

</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">                $this->assertEquals( $_post_data['post_author'], $_results['post_author'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'draft', $_results['post_status'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Submit Post for Approval

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Submit post for approval.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_post_data                = array();

</span><span class="cx" style="display: block; padding: 0 10px">                $_post_data['post_author'] = self::$contributor_id;

</span><span class="cx" style="display: block; padding: 0 10px">                $_post_data['post_type']   = 'post';

</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">                $this->assertEquals( $_post_data['post_author'], $_results['post_author'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'pending', $_results['post_status'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Create New Draft Post for another user

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create new draft post for another user.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_post_data                = array();

</span><span class="cx" style="display: block; padding: 0 10px">                $_post_data['post_author'] = self::$editor_id;

</span><span class="cx" style="display: block; padding: 0 10px">                $_post_data['post_type']   = 'post';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,7 +62,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'edit_others_posts', $_results->get_error_code() );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'Sorry, you are not allowed to create posts as this user.', $_results->get_error_message() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Edit Draft Post for another user

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Edit draft post for another user.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_post_data                = array();

</span><span class="cx" style="display: block; padding: 0 10px">                $_post_data['post_ID']     = self::factory()->post->create( array( 'post_author' => self::$editor_id ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $_post_data['post_author'] = self::$editor_id;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -79,7 +79,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test__wp_translate_postdata_cap_checks_editor() {

</span><span class="cx" style="display: block; padding: 0 10px">                wp_set_current_user( self::$editor_id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Create New Draft Post

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create new draft post.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_post_data                = array();

</span><span class="cx" style="display: block; padding: 0 10px">                $_post_data['post_author'] = self::$editor_id;

</span><span class="cx" style="display: block; padding: 0 10px">                $_post_data['post_type']   = 'post';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -90,7 +90,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $_post_data['post_author'], $_results['post_author'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'draft', $_results['post_status'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Publish Post

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Publish post.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_post_data                = array();

</span><span class="cx" style="display: block; padding: 0 10px">                $_post_data['post_author'] = self::$editor_id;

</span><span class="cx" style="display: block; padding: 0 10px">                $_post_data['post_type']   = 'post';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -101,7 +101,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $_post_data['post_author'], $_results['post_author'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'publish', $_results['post_status'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Create New Draft Post for another user

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create new draft post for another user.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_post_data                = array();

</span><span class="cx" style="display: block; padding: 0 10px">                $_post_data['post_author'] = self::$contributor_id;

</span><span class="cx" style="display: block; padding: 0 10px">                $_post_data['post_type']   = 'post';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -112,7 +112,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $_post_data['post_author'], $_results['post_author'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'draft', $_results['post_status'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Edit Draft Post for another user

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Edit draft post for another user.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_post_data                = array();

</span><span class="cx" style="display: block; padding: 0 10px">                $_post_data['post_ID']     = self::factory()->post->create( array( 'post_author' => self::$contributor_id ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $_post_data['post_author'] = self::$contributor_id;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -453,7 +453,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                wp_set_current_user( self::$admin_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">-                // Published posts should use published permalink

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Published posts should use published permalink.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $p = self::factory()->post->create(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_status' => 'publish',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -467,7 +467,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertContains( 'href="' . get_option( 'home' ) . '/' . $post->post_name . '/"', $found, $message );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertContains( '>new_slug-صورة<', $found, $message );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Scheduled posts should use published permalink

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Scheduled posts should use published permalink.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $future_date = gmdate( 'Y-m-d H:i:s', time() + 100 );

</span><span class="cx" style="display: block; padding: 0 10px">                $p           = self::factory()->post->create(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</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->assertContains( 'href="' . get_option( 'home' ) . '/' . $post->post_name . '/"', $found, $message );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertContains( '>new_slug-صورة<', $found, $message );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Draft posts should use preview link

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Draft posts should use preview link.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $p = self::factory()->post->create(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_status' => 'draft',

</span></span></pre></div>

<a id="trunktestsphpunittestsadminincludesScreenphp"></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/admin/includesScreen.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/admin/includesScreen.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/admin/includesScreen.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -245,13 +245,13 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_post_type_with_special_suffix_as_hookname() {

</span><span class="cx" style="display: block; padding: 0 10px">                register_post_type( 'value-add' );

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $screen = convert_to_screen( 'value-add' ); // the -add part is key.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $screen = convert_to_screen( 'value-add' ); // The '-add' part is key.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $screen->post_type, 'value-add' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $screen->base, 'post' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $screen->id, 'value-add' );

<span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $screen->is_block_editor ); // Post types do not support `show_in_rest` by default.

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $screen = convert_to_screen( 'edit-value-add' ); // the -add part is key.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $screen = convert_to_screen( 'edit-value-add' ); // The '-add' part is key.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $screen->post_type, 'value-add' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $screen->base, 'edit' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $screen->id, 'edit-value-add' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -260,7 +260,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_taxonomy_with_special_suffix_as_hookname() {

</span><span class="cx" style="display: block; padding: 0 10px">                register_taxonomy( 'old-or-new', 'post' );

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $screen = convert_to_screen( 'edit-old-or-new' ); // the -new part is key.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $screen = convert_to_screen( 'edit-old-or-new' ); // The '-new' part is key.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $screen->taxonomy, 'old-or-new' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $screen->base, 'edit-tags' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $screen->id, 'edit-old-or-new' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -369,12 +369,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'id'       => $tab_4,

</span><span class="cx" style="display: block; padding: 0 10px">                        'content'  => 'some content',

</span><span class="cx" style="display: block; padding: 0 10px">                        'callback' => false,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Don't include a priority

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Don't include a priority.

</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">                $screen = get_current_screen();

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // add help tabs.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Add help tabs.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $screen->add_help_tab( $tab_1_args );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertequals( $screen->get_help_tab( $tab_1 ), $tab_1_args );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -386,7 +386,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $screen->get_help_tab( $tab_3 ), $tab_3_args );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $screen->add_help_tab( $tab_4_args );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Priority is added with the default for future calls

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Priority is added with the default for future calls.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $tab_4_args['priority'] = 10;

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $screen->get_help_tab( $tab_4 ), $tab_4_args );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunktestsphpunittestsadminincludesTemplatephp"></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/admin/includesTemplate.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/admin/includesTemplate.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/admin/includesTemplate.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,7 +66,7 @@

<span class="cx" style="display: block; padding: 0 10px">                // Remove the meta box.

</span><span class="cx" style="display: block; padding: 0 10px">                remove_meta_box( 'testbox1', $current_screen, 'advanced' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check that it was removed properly (The meta box should be set to false once that it has been removed)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check that it was removed properly (the meta box should be set to false once that it has been removed).

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( $wp_meta_boxes[ $current_screen ]['advanced']['default']['testbox1'] );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,7 +76,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_add_meta_box_on_multiple_screens() {

</span><span class="cx" style="display: block; padding: 0 10px">                global $wp_meta_boxes;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Add a meta box to three different post types

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Add a meta box to three different post types.

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_meta_box( 'testbox1', 'Test Metabox', '__return_false', array( 'post', 'comment', 'attachment' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'testbox1', $wp_meta_boxes['post']['advanced']['default'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,7 +96,7 @@

<span class="cx" style="display: block; padding: 0 10px">                // Remove meta box from posts.

</span><span class="cx" style="display: block; padding: 0 10px">                remove_meta_box( 'testbox1', 'post', 'advanced' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check that we have removed the meta boxes only from posts

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check that we have removed the meta boxes only from posts.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( $wp_meta_boxes['post']['advanced']['default']['testbox1'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'testbox1', $wp_meta_boxes['comment']['advanced']['default'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'testbox1', $wp_meta_boxes['attachment']['advanced']['default'] );

</span></span></pre></div>

<a id="trunktestsphpunittestsadminincludesThemephp"></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/admin/includesTheme.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/admin/includesTheme.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/admin/includesTheme.php   2020-01-29 00:43:23 UTC (rev 47122)

</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">                add_filter( 'stylesheet_root', array( $this, '_theme_root' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'template_root', array( $this, '_theme_root' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // clear caches

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Clear caches.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_clean_themes_cache();

</span><span class="cx" style="display: block; padding: 0 10px">                unset( $GLOBALS['wp_themes'] );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,7 +31,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                parent::tearDown();

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // replace the normal theme root dir with our premade test dir

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Replace the normal theme root directory with our premade test directory.

</ins><span class="cx" style="display: block; padding: 0 10px">         function _theme_root( $dir ) {

</span><span class="cx" style="display: block; padding: 0 10px">                return $this->theme_root;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span></span></pre></div>

<a id="trunktestsphpunittestsadminbarphp"></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/adminbar.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/adminbar.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/adminbar.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -99,10 +99,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $node_user_info    = $wp_admin_bar->get_node( 'user-info' );

</span><span class="cx" style="display: block; padding: 0 10px">                $node_edit_profile = $wp_admin_bar->get_node( 'edit-profile' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Site menu points to the home page instead of the admin URL

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Site menu points to the home page instead of the admin URL.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( home_url( '/' ), $node_site_name->href );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // No profile links as the user doesn't have any permissions on the site

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // No profile links as the user doesn't have any permissions on the site.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( $node_my_account->href );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $node_user_info->href );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNull( $node_edit_profile );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,12 +124,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $node_user_info    = $wp_admin_bar->get_node( 'user-info' );

</span><span class="cx" style="display: block; padding: 0 10px">                $node_edit_profile = $wp_admin_bar->get_node( 'edit-profile' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Site menu points to the admin URL

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Site menu points to the admin URL.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( admin_url( '/' ), $node_site_name->href );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $profile_url = admin_url( 'profile.php' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Profile URLs point to profile.php

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Profile URLs point to profile.php.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $profile_url, $node_my_account->href );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $profile_url, $node_user_info->href );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $profile_url, $node_edit_profile->href );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -164,19 +164,19 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $node_user_info    = $wp_admin_bar->get_node( 'user-info' );

</span><span class="cx" style="display: block; padding: 0 10px">                $node_edit_profile = $wp_admin_bar->get_node( 'edit-profile' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // get primary blog

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Get primary blog.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $primary = get_active_blog_for_user( self::$editor_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'object', $primary );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // No Site menu as the user isn't a member of this blog

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // No Site menu as the user isn't a member of this blog.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertNull( $node_site_name );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $primary_profile_url = get_admin_url( $primary->blog_id, 'profile.php' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Ensure the user's primary blog is not the same as the main site

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Ensure the user's primary blog is not the same as the main site.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertNotEquals( $primary_profile_url, admin_url( 'profile.php' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Profile URLs should go to the user's primary blog

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Profile URLs should go to the user's primary blog.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $primary_profile_url, $node_my_account->href );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $primary_profile_url, $node_user_info->href );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $primary_profile_url, $node_edit_profile->href );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -203,7 +203,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( is_user_member_of_blog( self::$no_role_id, $blog_id ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( is_user_member_of_blog( self::$no_role_id, get_current_blog_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">-                // Remove `$nobody` from the current blog, so they're not a member of any blog

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Remove `$nobody` from the current blog, so they're not a member of any blog.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $removed = remove_user_from_blog( self::$no_role_id, get_current_blog_id() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $removed );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -220,11 +220,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $node_user_info    = $wp_admin_bar->get_node( 'user-info' );

</span><span class="cx" style="display: block; padding: 0 10px">                $node_edit_profile = $wp_admin_bar->get_node( 'edit-profile' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // get primary blog

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Get primary blog.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $primary = get_active_blog_for_user( self::$no_role_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNull( $primary );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // No Site menu as the user isn't a member of this site

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // No Site menu as the user isn't a member of this site.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertNull( $node_site_name );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $user_profile_url = user_admin_url( 'profile.php' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -231,7 +231,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEquals( $user_profile_url, admin_url( 'profile.php' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Profile URLs should go to the user's primary blog

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Profile URLs should go to the user's primary blog.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $user_profile_url, $node_my_account->href );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $user_profile_url, $node_user_info->href );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $user_profile_url, $node_edit_profile->href );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -335,7 +335,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                '<div class="ab-item ab-empty-item" tabindex="2">',

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</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">-                                // Boolean, false

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Boolean, false.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 array(

</span><span class="cx" style="display: block; padding: 0 10px">                                        'id'   => 'test-node',

</span><span class="cx" style="display: block; padding: 0 10px">                                        'meta' => array( 'tabindex' => false ),

</span></span></pre></div>

<a id="trunktestsphpunittestsajaxAddMetaphp"></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/ajax/AddMeta.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/AddMeta.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/ajax/AddMeta.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,7 +1,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> <?php

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Admin ajax functions to be tested

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Admin Ajax functions to be tested.

</ins><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> require_once( ABSPATH . 'wp-admin/includes/ajax-actions.php' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunktestsphpunittestsajaxAttachmentsphp"></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/ajax/Attachments.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/Attachments.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/ajax/Attachments.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,11 +1,11 @@

</span><span class="cx" style="display: block; padding: 0 10px"> <?php

</span><span class="cx" style="display: block; padding: 0 10px"> /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Admin ajax functions to be tested

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Admin Ajax functions to be tested.

</ins><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> require_once( ABSPATH . 'wp-admin/includes/ajax-actions.php' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> /**

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Testing ajax attachment handling.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Testing Ajax attachment handling.

</ins><span class="cx" style="display: block; padding: 0 10px">  *

</span><span class="cx" style="display: block; padding: 0 10px">  * @group ajax

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,7 +14,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 36578

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_wp_ajax_send_attachment_to_editor_should_return_an_image() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Become an administrator

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Become an administrator.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post    = $_POST;

</span><span class="cx" style="display: block; padding: 0 10px">                $user_id = self::factory()->user->create(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,7 +32,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $upload     = wp_upload_bits( wp_basename( $filename ), null, $contents );

</span><span class="cx" style="display: block; padding: 0 10px">                $attachment = $this->_make_attachment( $upload );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set up a default request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set up a default request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_POST['nonce']      = wp_create_nonce( 'media-send-to-editor' );

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['html']       = 'Bar Baz';

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['post_id']    = 0;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,7 +44,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'url'        => 'http://example.com/',

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 try {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->_handleAjax( 'send-attachment-to-editor' );

</span><span class="cx" style="display: block; padding: 0 10px">                } catch ( WPAjaxDieContinueException $e ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,7 +56,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = get_image_send_to_editor( $attachment, '', '', 'left', 'http://example.com/', false, 'large', 'Foo bar' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Ensure everything is correct

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Ensure everything is correct.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( $response['success'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected, $response['data'] );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,7 +65,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 36578

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_wp_ajax_send_attachment_to_editor_should_return_a_link() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Become an administrator

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Become an administrator.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post    = $_POST;

</span><span class="cx" style="display: block; padding: 0 10px">                $user_id = self::factory()->user->create(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</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">                $upload     = wp_upload_bits( wp_basename( $filename ), null, $contents );

</span><span class="cx" style="display: block; padding: 0 10px">                $attachment = $this->_make_attachment( $upload );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set up a default request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set up a default request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_POST['nonce']      = wp_create_nonce( 'media-send-to-editor' );

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['html']       = 'Bar Baz';

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['post_id']    = 0;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -93,7 +93,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'url'        => get_attachment_link( $attachment ),

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 try {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->_handleAjax( 'send-attachment-to-editor' );

</span><span class="cx" style="display: block; padding: 0 10px">                } catch ( WPAjaxDieContinueException $e ) {

</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">                        $attachment

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Ensure everything is correct

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Ensure everything is correct.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( $response['success'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected, $response['data'] );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span></span></pre></div>

<a id="trunktestsphpunittestsajaxAutosavephp"></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/ajax/Autosave.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/Autosave.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/ajax/Autosave.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,12 +1,12 @@

</span><span class="cx" style="display: block; padding: 0 10px"> <?php

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Admin ajax functions to be tested

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Admin Ajax functions to be tested.

</ins><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> require_once( ABSPATH . 'wp-admin/includes/ajax-actions.php' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Testing ajax save draft functionality

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Testing Ajax save draft functionality.

</ins><span class="cx" style="display: block; padding: 0 10px">  *

</span><span class="cx" style="display: block; padding: 0 10px">  * @package    WordPress

</span><span class="cx" style="display: block; padding: 0 10px">  * @subpackage UnitTests

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,7 +43,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function setUp() {

</span><span class="cx" style="display: block; padding: 0 10px">                parent::setUp();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set a user so the $post has 'post_author'

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set a user so the $post has 'post_author'.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_set_current_user( self::$admin_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">@@ -53,10 +53,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @return void

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_autosave_post() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // The original post_author

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // The original post_author.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_set_current_user( self::$admin_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">-                // Set up the $_POST request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set up the $_POST request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $md5   = md5( uniqid() );

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'action' => 'heartbeat',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,7 +71,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 try {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->_handleAjax( 'heartbeat' );

</span><span class="cx" style="display: block; padding: 0 10px">                } catch ( WPAjaxDieContinueException $e ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -78,14 +78,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        unset( $e );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Get the response, it is in heartbeat's response

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Get the response, it is in heartbeat's response.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $response = json_decode( $this->_last_response, 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">-                // Ensure everything is correct

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Ensure everything is correct.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertNotEmpty( $response['wp_autosave'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $response['wp_autosave']['success'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check that the edit happened

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check that the edit happened.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post = get_post( self::$post_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertGreaterThanOrEqual( 0, strpos( self::$post->post_content, $md5 ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,16 +96,16 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @return void

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_autosave_locked_post() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Lock the post to another user

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Lock the post to another user.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_set_current_user( self::$editor_id );

</span><span class="cx" style="display: block; padding: 0 10px">                wp_set_post_lock( self::$post_id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                wp_set_current_user( self::$admin_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">-                // Ensure post is locked

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Ensure post is locked.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( self::$editor_id, wp_check_post_lock( self::$post_id ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set up the $_POST request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set up the $_POST request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $md5   = md5( uniqid() );

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'action' => 'heartbeat',

</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">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 try {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->_handleAjax( 'heartbeat' );

</span><span class="cx" style="display: block; padding: 0 10px">                } catch ( WPAjaxDieContinueException $e ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -129,15 +129,15 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $response = json_decode( $this->_last_response, 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">-                // Ensure everything is correct

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Ensure everything is correct.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertNotEmpty( $response['wp_autosave'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $response['wp_autosave']['success'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check that the original post was NOT edited

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check that the original post was NOT edited.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post = get_post( self::$post_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( strpos( $post->post_content, $md5 ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check if the autosave post was created

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check if the autosave post was created.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $autosave = wp_get_post_autosave( self::$post_id, get_current_user_id() );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEmpty( $autosave );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertGreaterThanOrEqual( 0, strpos( $autosave->post_content, $md5 ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -152,7 +152,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                wp_set_current_user( self::$admin_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">-                // Set up the $_POST request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set up the $_POST request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_POST = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'action' => 'heartbeat',

</span><span class="cx" style="display: block; padding: 0 10px">                        '_nonce' => wp_create_nonce( 'heartbeat-nonce' ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -164,7 +164,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 try {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->_handleAjax( 'heartbeat' );

</span><span class="cx" style="display: block; padding: 0 10px">                } catch ( WPAjaxDieContinueException $e ) {

</span></span></pre></div>

<a id="trunktestsphpunittestsajaxCompressionphp"></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/ajax/Compression.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/Compression.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/ajax/Compression.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,12 +1,12 @@

</span><span class="cx" style="display: block; padding: 0 10px"> <?php

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Admin ajax functions to be tested

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Admin Ajax functions to be tested.

</ins><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> require_once( ABSPATH . 'wp-admin/includes/ajax-actions.php' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Testing ajax compression test functionality

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Testing Ajax compression test functionality.

</ins><span class="cx" style="display: block; padding: 0 10px">  *

</span><span class="cx" style="display: block; padding: 0 10px">  * @package    WordPress

</span><span class="cx" style="display: block; padding: 0 10px">  * @subpackage UnitTests

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,10 +21,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_logged_out() {

</span><span class="cx" style="display: block; padding: 0 10px">                $this->logout();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set up a default request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set up a default request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_GET['test'] = 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">-                // Make the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->setExpectedException( 'WPAjaxDieStopException', '-1' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->_handleAjax( 'wp-compression-test' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,13 +34,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_text() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Become an administrator

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Become an administrator.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_setRole( 'administrator' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set up a default request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set up a default request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_GET['test'] = 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">-                // Make the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 try {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->_handleAjax( 'wp-compression-test' );

</span><span class="cx" style="display: block; padding: 0 10px">                } catch ( WPAjaxDieContinueException $e ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -47,7 +47,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        unset( $e );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Ensure we found the right match

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Ensure we found the right match.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertContains( 'wpCompressionTest', $this->_last_response );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,14 +60,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->fail( 'gzdeflate function not available' );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Become an administrator

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Become an administrator.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_setRole( 'administrator' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set up a default request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set up a default request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_GET['test']                    = 2;

</span><span class="cx" style="display: block; padding: 0 10px">                $_SERVER['HTTP_ACCEPT_ENCODING'] = 'deflate';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 try {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->_handleAjax( 'wp-compression-test' );

</span><span class="cx" style="display: block; padding: 0 10px">                } catch ( WPAjaxDieContinueException $e ) {

</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">                        unset( $e );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Ensure we found the right match

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Ensure we found the right match.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertContains( 'wpCompressionTest', gzinflate( $this->_last_response ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -87,14 +87,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->fail( 'gzencode function not available' );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Become an administrator

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Become an administrator.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_setRole( 'administrator' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set up a default request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set up a default request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_GET['test']                    = 2;

</span><span class="cx" style="display: block; padding: 0 10px">                $_SERVER['HTTP_ACCEPT_ENCODING'] = 'gzip';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 try {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->_handleAjax( 'wp-compression-test' );

</span><span class="cx" style="display: block; padding: 0 10px">                } catch ( WPAjaxDieContinueException $e ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -101,7 +101,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        unset( $e );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Ensure we found the right match

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Ensure we found the right match.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertContains( 'wpCompressionTest', $this->_gzdecode( $this->_last_response ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -110,14 +110,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_unknown_encoding() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Become an administrator

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Become an administrator.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_setRole( 'administrator' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set up a default request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set up a default request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_GET['test']                    = 2;

</span><span class="cx" style="display: block; padding: 0 10px">                $_SERVER['HTTP_ACCEPT_ENCODING'] = 'unknown';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->setExpectedException( 'WPAjaxDieStopException', '-1' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->_handleAjax( 'wp-compression-test' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -127,16 +127,16 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_set_yes() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Become an administrator

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Become an administrator.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_setRole( 'administrator' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set up a default request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set up a default request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_GET['test'] = 'yes';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set the option to false

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set the option to false.

</ins><span class="cx" style="display: block; padding: 0 10px">                 update_site_option( 'can_compress_scripts', 0 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 try {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->_handleAjax( 'wp-compression-test' );

</span><span class="cx" style="display: block; padding: 0 10px">                } catch ( WPAjaxDieStopException $e ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -143,13 +143,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        unset( $e );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check the site option is not changed due to lack of nonce

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check the site option is not changed due to lack of nonce.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 0, get_site_option( 'can_compress_scripts' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Add a nonce

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Add a nonce.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_GET['_ajax_nonce'] = wp_create_nonce( 'update_can_compress_scripts' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Retry the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Retry the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 try {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->_handleAjax( 'wp-compression-test' );

</span><span class="cx" style="display: block; padding: 0 10px">                } catch ( WPAjaxDieStopException $e ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -156,7 +156,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        unset( $e );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check the site option is changed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check the site option is changed.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 1, get_site_option( 'can_compress_scripts' ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -165,16 +165,16 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_set_no() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Become an administrator

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Become an administrator.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_setRole( 'administrator' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set up a default request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set up a default request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_GET['test'] = 'no';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set the option to true

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set the option to true.

</ins><span class="cx" style="display: block; padding: 0 10px">                 update_site_option( 'can_compress_scripts', 1 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 try {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->_handleAjax( 'wp-compression-test' );

</span><span class="cx" style="display: block; padding: 0 10px">                } catch ( WPAjaxDieStopException $e ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -181,13 +181,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        unset( $e );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check the site option is not changed due to lack of nonce

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check the site option is not changed due to lack of nonce.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 1, get_site_option( 'can_compress_scripts' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Add a nonce

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Add a nonce.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_GET['_ajax_nonce'] = wp_create_nonce( 'update_can_compress_scripts' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Retry the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Retry the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 try {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->_handleAjax( 'wp-compression-test' );

</span><span class="cx" style="display: block; padding: 0 10px">                } catch ( WPAjaxDieStopException $e ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -194,7 +194,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        unset( $e );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check the site option is changed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check the site option is changed.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 0, get_site_option( 'can_compress_scripts' ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -206,19 +206,19 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        protected function _gzdecode( $encoded_data ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Save the encoded data to a temp file

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Save the encoded data to a temp file.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $file = wp_tempnam( 'gzdecode' );

</span><span class="cx" style="display: block; padding: 0 10px">                file_put_contents( $file, $encoded_data );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Flush it to the output buffer and delete the temp file

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Flush it to the output buffer and delete the temp file.

</ins><span class="cx" style="display: block; padding: 0 10px">                 ob_start();

</span><span class="cx" style="display: block; padding: 0 10px">                readgzfile( $file );

</span><span class="cx" style="display: block; padding: 0 10px">                unlink( $file );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Save the data stop buffering

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Save the data stop buffering.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $data = ob_get_clean();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Done

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Done.

</ins><span class="cx" style="display: block; padding: 0 10px">                 return $data;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span></span></pre></div>

<a id="trunktestsphpunittestsajaxCustomizeManagerphp"></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/ajax/CustomizeManager.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/CustomizeManager.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/ajax/CustomizeManager.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,6 @@

</span><span class="cx" style="display: block; padding: 0 10px"> <?php

</span><span class="cx" style="display: block; padding: 0 10px"> /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Testing ajax customize manager functionality

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Testing Ajax customize manager functionality.

</ins><span class="cx" style="display: block; padding: 0 10px">  *

</span><span class="cx" style="display: block; padding: 0 10px">  * @package    WordPress

</span><span class="cx" style="display: block; padding: 0 10px">  * @subpackage UnitTests

</span></span></pre></div>

<a id="trunktestsphpunittestsajaxCustomizeMenusphp"></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/ajax/CustomizeMenus.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/CustomizeMenus.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/ajax/CustomizeMenus.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,6 @@

</span><span class="cx" style="display: block; padding: 0 10px"> <?php

</span><span class="cx" style="display: block; padding: 0 10px"> /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Testing ajax customize menus functionality

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Testing Ajax customize menus functionality.

</ins><span class="cx" style="display: block; padding: 0 10px">  *

</span><span class="cx" style="display: block; padding: 0 10px">  * @package    WordPress

</span><span class="cx" style="display: block; padding: 0 10px">  * @subpackage UnitTests

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -86,8 +86,8 @@

</span><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">         *     @type array {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @string string $role             The role that will test caps for.

-        * @array  array  $expected_results The expected results from the ajax call.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  *         @string string $role             The role that will test caps for.

+        *         @array  array  $expected_results The expected results from the Ajax call.

</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">@@ -157,7 +157,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @return array {

</span><span class="cx" style="display: block; padding: 0 10px">         *     @type array {

<span class="cx" style="display: block; padding: 0 10px">         * @array array $post_args        The arguments that will merged with the $_POST array.

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @array array $expected_results The expected results from the ajax call.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @array array $expected_results The expected results from the Ajax call.

</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">@@ -477,7 +477,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @return array {

</span><span class="cx" style="display: block; padding: 0 10px">         *     @type array {

<span class="cx" style="display: block; padding: 0 10px">         * @string string $role             The role that will test caps for.

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @array  array  $expected_results The expected results from the ajax call.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @array  array  $expected_results The expected results from the Ajax call.

</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">@@ -568,8 +568,8 @@

</span><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">         *     @type array {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @string string $post_args        The args that will be passed to ajax.

-        * @array  array  $expected_results The expected results from the ajax call.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @string string $post_args        The args that will be passed to Ajax.

+        * @array  array  $expected_results The expected results from the Ajax call.

</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="trunktestsphpunittestsajaxDeleteCommentphp"></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/ajax/DeleteComment.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/DeleteComment.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/ajax/DeleteComment.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,12 +1,12 @@

</span><span class="cx" style="display: block; padding: 0 10px"> <?php

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Admin ajax functions to be tested

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Admin Ajax functions to be tested.

</ins><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> require_once( ABSPATH . 'wp-admin/includes/ajax-actions.php' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Testing ajax comment functionality

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Testing Ajax comment functionality.

</ins><span class="cx" style="display: block; padding: 0 10px">  *

</span><span class="cx" style="display: block; padding: 0 10px">  * @package    WordPress

</span><span class="cx" style="display: block; padding: 0 10px">  * @subpackage UnitTests

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,13 +62,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function _test_as_admin( $comment, $action ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Reset request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Reset request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_clear_post_action();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Become an administrator

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Become an administrator.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_setRole( 'administrator' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set up a default request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set up a default request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_POST['id']          = $comment->comment_ID;

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['_ajax_nonce'] = wp_create_nonce( 'delete-comment_' . $comment->comment_ID );

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST[ $action ]     = 1;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,7 +77,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['_page']       = 1;

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['_url']        = admin_url( 'edit-comments.php' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 try {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->_handleAjax( 'delete-comment' );

</span><span class="cx" style="display: block; padding: 0 10px">                } catch ( WPAjaxDieContinueException $e ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,29 +84,29 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        unset( $e );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Get the response

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Get the response.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $xml = simplexml_load_string( $this->_last_response, 'SimpleXMLElement', LIBXML_NOCDATA );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Ensure everything is correct

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Ensure everything is correct.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $comment->comment_ID, (string) $xml->response[0]->comment['id'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'delete-comment_' . $comment->comment_ID, (string) $xml->response['action'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertGreaterThanOrEqual( time() - 10, (int) $xml->response[0]->comment[0]->supplemental[0]->time[0] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertLessThanOrEqual( time(), (int) $xml->response[0]->comment[0]->supplemental[0]->time[0] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // trash, spam, delete should make the total go down

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // 'trash', 'spam', 'delete' should make the total go down.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( in_array( $action, array( 'trash', 'spam', 'delete' ), true ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $total = $_POST['_total'] - 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">-                        // unspam, untrash should make the total go up

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // 'unspam', 'untrash' should make the total go up.

</ins><span class="cx" style="display: block; padding: 0 10px">                 } elseif ( in_array( $action, array( 'untrash', 'unspam' ), true ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $total = $_POST['_total'] + 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">-                // The total is calculated based on a page break -OR- a random number.  Let's look for both possible outcomes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // The total is calculated based on a page break -OR- a random number. Let's look for both possible outcomes.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $comment_count = wp_count_comments( 0 );

</span><span class="cx" style="display: block; padding: 0 10px">                $recalc_total  = $comment_count->total_comments;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check for either possible total

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check for either possible total.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $message = sprintf( 'returned value: %1$d $total: %2$d  $recalc_total: %3$d', (int) $xml->response[0]->comment[0]->supplemental[0]->total[0], $total, $recalc_total );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( in_array( (int) $xml->response[0]->comment[0]->supplemental[0]->total[0], array( $total, $recalc_total ), true ), $message );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -121,13 +121,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function _test_as_subscriber( $comment, $action ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Reset request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Reset request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_clear_post_action();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Become a subscriber

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Become a subscriber.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_setRole( 'subscriber' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set up the $_POST request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set up the $_POST request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_POST['id']          = $comment->comment_ID;

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['_ajax_nonce'] = wp_create_nonce( 'delete-comment_' . $comment->comment_ID );

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST[ $action ]     = 1;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -136,7 +136,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['_page']       = 1;

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['_url']        = admin_url( 'edit-comments.php' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->setExpectedException( 'WPAjaxDieStopException', '-1' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->_handleAjax( 'delete-comment' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -152,13 +152,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function _test_with_bad_nonce( $comment, $action ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Reset request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Reset request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_clear_post_action();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Become a subscriber

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Become a subscriber.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_setRole( 'administrator' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set up the $_POST request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set up the $_POST request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_POST['id']          = $comment->comment_ID;

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['_ajax_nonce'] = wp_create_nonce( uniqid() );

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST[ $action ]     = 1;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -167,7 +167,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['_page']       = 1;

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['_url']        = admin_url( 'edit-comments.php' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->setExpectedException( 'WPAjaxDieStopException', '-1' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->_handleAjax( 'delete-comment' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -182,13 +182,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function _test_with_bad_id( $comment, $action ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Reset request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Reset request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_clear_post_action();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Become a subscriber

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Become a subscriber.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_setRole( 'administrator' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set up the $_POST request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set up the $_POST request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_POST['id']          = 12346789;

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['_ajax_nonce'] = wp_create_nonce( 'delete-comment_12346789' );

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST[ $action ]     = 1;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -197,7 +197,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['_page']       = 1;

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['_url']        = admin_url( 'edit-comments.php' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make the request, look for a timestamp in the exception

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make the request, look for a timestamp in the exception.

</ins><span class="cx" style="display: block; padding: 0 10px">                 try {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->_handleAjax( 'delete-comment' );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->fail( 'Expected exception: WPAjaxDieStopException' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -219,13 +219,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function _test_double_action( $comment, $action ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Reset request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Reset request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_clear_post_action();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Become a subscriber

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Become a subscriber.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_setRole( 'administrator' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set up the $_POST request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set up the $_POST request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_POST['id']          = $comment->comment_ID;

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['_ajax_nonce'] = wp_create_nonce( 'delete-comment_' . $comment->comment_ID );

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST[ $action ]     = 1;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -234,7 +234,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['_page']       = 1;

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['_url']        = admin_url( 'edit-comments.php' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 try {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->_handleAjax( 'delete-comment' );

</span><span class="cx" style="display: block; padding: 0 10px">                } catch ( WPAjaxDieContinueException $e ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -242,12 +242,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">                $this->_last_response = '';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Force delete the comment

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Force delete the comment.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( 'delete' === $action ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        wp_delete_comment( $comment->comment_ID, 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">-                // Make the request again, look for a timestamp in the exception

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make the request again, look for a timestamp in the exception.

</ins><span class="cx" style="display: block; padding: 0 10px">                 try {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->_handleAjax( 'delete-comment' );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->fail( 'Expected exception: WPAjaxDieStopException' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -265,15 +265,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @return void

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_ajax_comment_trash_actions_as_administrator() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test trash/untrash

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test trash/untrash.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_test_as_admin( self::$comments[0], 'trash' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->_test_as_admin( self::$comments[0], 'untrash' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test spam/unspam

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test spam/unspam.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_test_as_admin( self::$comments[1], 'spam' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->_test_as_admin( self::$comments[1], 'unspam' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test delete

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test delete.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_test_as_admin( self::$comments[2], 'delete' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -283,15 +283,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @return void

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_ajax_comment_trash_actions_as_subscriber() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test trash/untrash

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test trash/untrash.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_test_as_subscriber( self::$comments[0], 'trash' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->_test_as_subscriber( self::$comments[0], 'untrash' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test spam/unspam

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test spam/unspam.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_test_as_subscriber( self::$comments[1], 'spam' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->_test_as_subscriber( self::$comments[1], 'unspam' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test delete

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test delete.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_test_as_subscriber( self::$comments[2], 'delete' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -301,15 +301,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @return void

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_ajax_trash_comment_no_id() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test trash/untrash

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test trash/untrash.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_test_as_admin( self::$comments[0], 'trash' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->_test_as_admin( self::$comments[0], 'untrash' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test spam/unspam

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test spam/unspam.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_test_as_admin( self::$comments[1], 'spam' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->_test_as_admin( self::$comments[1], 'unspam' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test delete

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test delete.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_test_as_admin( self::$comments[2], 'delete' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -319,15 +319,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @return void

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_ajax_trash_comment_bad_nonce() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test trash/untrash

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test trash/untrash.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_test_with_bad_nonce( self::$comments[0], 'trash' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->_test_with_bad_nonce( self::$comments[0], 'untrash' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test spam/unspam

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test spam/unspam.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_test_with_bad_nonce( self::$comments[1], 'spam' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->_test_with_bad_nonce( self::$comments[1], 'unspam' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test delete

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test delete.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_test_with_bad_nonce( self::$comments[2], 'delete' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -337,15 +337,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @return void

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_ajax_trash_double_action() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test trash/untrash

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test trash/untrash.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_test_double_action( self::$comments[0], 'trash' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->_test_double_action( self::$comments[0], 'untrash' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test spam/unspam

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test spam/unspam.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_test_double_action( self::$comments[1], 'spam' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->_test_double_action( self::$comments[1], 'unspam' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test delete

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test delete.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_test_double_action( self::$comments[2], 'delete' );

</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="trunktestsphpunittestsajaxDeletePluginphp"></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/ajax/DeletePlugin.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/DeletePlugin.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/ajax/DeletePlugin.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,6 @@

</span><span class="cx" style="display: block; padding: 0 10px"> <?php

</span><span class="cx" style="display: block; padding: 0 10px"> /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Admin ajax functions to be tested

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Admin Ajax functions to be tested.

</ins><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> require_once( ABSPATH . 'wp-admin/includes/ajax-actions.php' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,7 +22,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['_ajax_nonce'] = wp_create_nonce( 'updates' );

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['slug']        = 'foo';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 try {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->_handleAjax( 'delete-plugin' );

</span><span class="cx" style="display: block; padding: 0 10px">                } catch ( WPAjaxDieContinueException $e ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,7 +48,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['_ajax_nonce'] = wp_create_nonce( 'updates' );

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['plugin']      = 'foo/bar.php';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 try {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->_handleAjax( 'delete-plugin' );

</span><span class="cx" style="display: block; padding: 0 10px">                } catch ( WPAjaxDieContinueException $e ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,7 +75,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['plugin']      = 'foo/bar.php';

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['slug']        = 'foo';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 try {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->_handleAjax( 'delete-plugin' );

</span><span class="cx" style="display: block; padding: 0 10px">                } catch ( WPAjaxDieContinueException $e ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -104,7 +104,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['plugin']      = '../foo/bar.php';

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['slug']        = 'foo';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 try {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->_handleAjax( 'delete-plugin' );

</span><span class="cx" style="display: block; padding: 0 10px">                } catch ( WPAjaxDieContinueException $e ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -133,7 +133,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['plugin']      = 'foo.php';

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['slug']        = 'foo';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 try {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->_handleAjax( 'delete-plugin' );

</span><span class="cx" style="display: block; padding: 0 10px">                } catch ( WPAjaxDieContinueException $e ) {

</span></span></pre></div>

<a id="trunktestsphpunittestsajaxDimCommentphp"></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/ajax/DimComment.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/DimComment.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/ajax/DimComment.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,12 +1,12 @@

</span><span class="cx" style="display: block; padding: 0 10px"> <?php

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Admin ajax functions to be tested

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Admin Ajax functions to be tested.

</ins><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> require_once( ABSPATH . 'wp-admin/includes/ajax-actions.php' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Testing ajax comment functionality

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Testing Ajax comment functionality

</ins><span class="cx" style="display: block; padding: 0 10px">  *

</span><span class="cx" style="display: block; padding: 0 10px">  * @package    WordPress

</span><span class="cx" style="display: block; padding: 0 10px">  * @subpackage UnitTests

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,13 +54,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function _test_as_admin( $comment ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Reset request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Reset request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_clear_post_action();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Become an administrator

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Become an administrator.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_setRole( 'administrator' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set up a default request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set up a default request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_POST['id']          = $comment->comment_ID;

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['_ajax_nonce'] = wp_create_nonce( 'approve-comment_' . $comment->comment_ID );

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['_total']      = count( $this->_comments );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -68,10 +68,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['_page']       = 1;

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['_url']        = admin_url( 'edit-comments.php' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Save the comment status

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Save the comment status.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $prev_status = wp_get_comment_status( $comment->comment_ID );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 try {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->_handleAjax( 'dim-comment' );

</span><span class="cx" style="display: block; padding: 0 10px">                } catch ( WPAjaxDieContinueException $e ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -78,16 +78,16 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        unset( $e );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Get the response

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Get the response.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $xml = simplexml_load_string( $this->_last_response, 'SimpleXMLElement', LIBXML_NOCDATA );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Ensure everything is correct

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Ensure everything is correct.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $comment->comment_ID, (string) $xml->response[0]->comment['id'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'dim-comment_' . $comment->comment_ID, (string) $xml->response['action'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertGreaterThanOrEqual( time() - 10, (int) $xml->response[0]->comment[0]->supplemental[0]->time[0] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertLessThanOrEqual( time(), (int) $xml->response[0]->comment[0]->supplemental[0]->time[0] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check the status

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check the status.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $current = wp_get_comment_status( $comment->comment_ID );

</span><span class="cx" style="display: block; padding: 0 10px">                if ( in_array( $prev_status, array( 'unapproved', 'spam' ), true ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( 'approved', $current );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -95,14 +95,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( 'unapproved', $current );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // The total is calculated based on a page break -OR- a random number.  Let's look for both possible outcomes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // The total is calculated based on a page break -OR- a random number. Let's look for both possible outcomes.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $comment_count = wp_count_comments( 0 );

</span><span class="cx" style="display: block; padding: 0 10px">                $recalc_total  = $comment_count->total_comments;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Delta is not specified, it will always be 1 lower than the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Delta is not specified, it will always be 1 lower than the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $total = $_POST['_total'] - 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">-                // Check for either possible total

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check for either possible total.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( in_array( (int) $xml->response[0]->comment[0]->supplemental[0]->total[0], array( $total, $recalc_total ), true ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,13 +115,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function _test_as_subscriber( $comment ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Reset request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Reset request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_clear_post_action();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Become a subscriber

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Become a subscriber.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_setRole( 'subscriber' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set up the $_POST request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set up the $_POST request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_POST['id']          = $comment->comment_ID;

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['_ajax_nonce'] = wp_create_nonce( 'approve-comment_' . $comment->comment_ID );

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['_total']      = count( $this->_comments );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -129,7 +129,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['_page']       = 1;

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['_url']        = admin_url( 'edit-comments.php' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->setExpectedException( 'WPAjaxDieStopException', '-1' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->_handleAjax( 'dim-comment' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -143,13 +143,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function _test_with_bad_nonce( $comment ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Reset request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Reset request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_clear_post_action();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Become a subscriber

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Become a subscriber.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_setRole( 'administrator' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set up the $_POST request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set up the $_POST request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_POST['id']          = $comment->comment_ID;

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['_ajax_nonce'] = wp_create_nonce( uniqid() );

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['_total']      = count( $this->_comments );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -157,7 +157,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['_page']       = 1;

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['_url']        = admin_url( 'edit-comments.php' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->setExpectedException( 'WPAjaxDieStopException', '-1' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->_handleAjax( 'dim-comment' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -170,13 +170,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_with_bad_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">-                // Reset request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Reset request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_clear_post_action();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Become a subscriber

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Become a subscriber.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_setRole( 'administrator' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set up the $_POST request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set up the $_POST request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_POST['id']          = 12346789;

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['_ajax_nonce'] = wp_create_nonce( 'dim-comment_12346789' );

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['_total']      = count( $this->_comments );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -184,16 +184,16 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['_page']       = 1;

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['_url']        = admin_url( 'edit-comments.php' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make the request, look for a timestamp in the exception

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make the request, look for a timestamp in the exception.

</ins><span class="cx" style="display: block; padding: 0 10px">                 try {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->_handleAjax( 'dim-comment' );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->fail( 'Expected exception: WPAjaxDieContinueException' );

</span><span class="cx" style="display: block; padding: 0 10px">                } catch ( WPAjaxDieContinueException $e ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Get the response

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Get the response.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $xml = simplexml_load_string( $this->_last_response, 'SimpleXMLElement', LIBXML_NOCDATA );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Ensure everything is correct

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Ensure everything is correct.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertEquals( '0', (string) $xml->response[0]->comment['id'] );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( 'dim-comment_0', (string) $xml->response['action'] );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertContains( 'Comment ' . $_POST['id'] . ' does not exist', $this->_last_response );

</span></span></pre></div>

<a id="trunktestsphpunittestsajaxEditCommentphp"></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/ajax/EditComment.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/EditComment.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/ajax/EditComment.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,12 +1,12 @@

</span><span class="cx" style="display: block; padding: 0 10px"> <?php

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Admin ajax functions to be tested

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Admin Ajax functions to be tested.

</ins><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> require_once( ABSPATH . 'wp-admin/includes/ajax-actions.php' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Testing ajax comment functionality

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Testing Ajax comment functionality.

</ins><span class="cx" style="display: block; padding: 0 10px">  *

</span><span class="cx" style="display: block; padding: 0 10px">  * @package    WordPress

</span><span class="cx" style="display: block; padding: 0 10px">  * @subpackage UnitTests

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,10 +40,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_as_admin() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Become an administrator

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Become an administrator.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_setRole( 'administrator' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Get a comment

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Get a comment.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $comments = get_comments(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_id' => $this->_comment_post->ID,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,12 +51,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $comment  = array_pop( $comments );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set up a default request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set up a default request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_POST['_ajax_nonce-replyto-comment'] = wp_create_nonce( 'replyto-comment' );

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['comment_ID']                  = $comment->comment_ID;

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['content']                     = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 try {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->_handleAjax( 'edit-comment' );

</span><span class="cx" style="display: block; padding: 0 10px">                } catch ( WPAjaxDieContinueException $e ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -63,18 +63,18 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        unset( $e );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Get the response

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Get the response.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $xml = simplexml_load_string( $this->_last_response, 'SimpleXMLElement', LIBXML_NOCDATA );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check the meta data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check the meta data.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( -1, (string) $xml->response[0]->edit_comment['position'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $comment->comment_ID, (string) $xml->response[0]->edit_comment['id'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'edit-comment_' . $comment->comment_ID, (string) $xml->response['action'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check the payload

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check the payload.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertNotEmpty( (string) $xml->response[0]->edit_comment[0]->response_data );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // And supplemental is empty

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // And supplemental is empty.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEmpty( (string) $xml->response[0]->edit_comment[0]->supplemental );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,10 +84,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_editor_can_edit_orphan_comments() {

</span><span class="cx" style="display: block; padding: 0 10px">                global $wpdb;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Become an editor

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Become an editor.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_setRole( 'editor' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Get a comment

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Get a comment.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $comments = get_comments(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_id' => $this->_comment_post->ID,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -95,16 +95,16 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $comment  = array_pop( $comments );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Manually update the comment_post_ID, because wp_update_comment() will prevent it.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Manually update the comment_post_ID, because wp_update_comment() will prevent it..

</ins><span class="cx" style="display: block; padding: 0 10px">                 $wpdb->update( $wpdb->comments, array( 'comment_post_ID' => 0 ), array( 'comment_ID' => $comment->comment_ID ) );

</span><span class="cx" style="display: block; padding: 0 10px">                clean_comment_cache( $comment->comment_ID );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set up a default request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set up a default request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_POST['_ajax_nonce-replyto-comment'] = wp_create_nonce( 'replyto-comment' );

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['comment_ID']                  = $comment->comment_ID;

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['content']                     = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 try {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->_handleAjax( 'edit-comment' );

</span><span class="cx" style="display: block; padding: 0 10px">                } catch ( WPAjaxDieContinueException $e ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -111,18 +111,18 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        unset( $e );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Get the response

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Get the response.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $xml = simplexml_load_string( $this->_last_response, 'SimpleXMLElement', LIBXML_NOCDATA );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check the meta data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check the meta data.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( -1, (string) $xml->response[0]->edit_comment['position'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $comment->comment_ID, (string) $xml->response[0]->edit_comment['id'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'edit-comment_' . $comment->comment_ID, (string) $xml->response['action'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check the payload

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check the payload.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertNotEmpty( (string) $xml->response[0]->edit_comment[0]->response_data );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // And supplemental is empty

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // And supplemental is empty.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEmpty( (string) $xml->response[0]->edit_comment[0]->supplemental );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -134,10 +134,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_as_subscriber() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Become an administrator

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Become a subscriber.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_setRole( 'subscriber' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Get a comment

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Get a comment.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $comments = get_comments(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_id' => $this->_comment_post->ID,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -145,12 +145,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $comment  = array_pop( $comments );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set up a default request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set up a default request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_POST['_ajax_nonce-replyto-comment'] = wp_create_nonce( 'replyto-comment' );

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['comment_ID']                  = $comment->comment_ID;

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['content']                     = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->setExpectedException( 'WPAjaxDieStopException', '-1' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->_handleAjax( 'edit-comment' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -163,10 +163,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_bad_nonce() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Become an administrator

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Become an administrator.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_setRole( 'administrator' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Get a comment

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Get a comment.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $comments = get_comments(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_id' => $this->_comment_post->ID,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -174,12 +174,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $comment  = array_pop( $comments );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set up a default request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set up a default request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_POST['_ajax_nonce-replyto-comment'] = wp_create_nonce( uniqid() );

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['comment_ID']                  = $comment->comment_ID;

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['content']                     = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->setExpectedException( 'WPAjaxDieStopException', '-1' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->_handleAjax( 'get-comments' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -192,15 +192,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_invalid_comment() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Become an administrator

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Become an administrator.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_setRole( 'administrator' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set up a default request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set up a default request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_POST['_ajax_nonce-replyto-comment'] = wp_create_nonce( 'replyto-comment' );

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['comment_ID']                  = 123456789;

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['content']                     = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->setExpectedException( 'WPAjaxDieStopException', '-1' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->_handleAjax( 'edit-comment' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span></span></pre></div>

<a id="trunktestsphpunittestsajaxGetCommentsphp"></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/ajax/GetComments.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/GetComments.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/ajax/GetComments.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,12 +1,12 @@

</span><span class="cx" style="display: block; padding: 0 10px"> <?php

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Admin ajax functions to be tested

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Admin Ajax functions to be tested.

</ins><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> require_once( ABSPATH . 'wp-admin/includes/ajax-actions.php' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Testing ajax comment functionality

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Testing Ajax comment functionality.

</ins><span class="cx" style="display: block; padding: 0 10px">  *

</span><span class="cx" style="display: block; padding: 0 10px">  * @package    WordPress

</span><span class="cx" style="display: block; padding: 0 10px">  * @subpackage UnitTests

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -45,15 +45,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_as_admin() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Become an administrator

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Become an administrator.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_setRole( 'administrator' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set up a default request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set up a default request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_POST['_ajax_nonce'] = wp_create_nonce( 'get-comments' );

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['action']      = 'get-comments';

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['p']           = self::$comment_post->ID;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 try {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->_handleAjax( 'get-comments' );

</span><span class="cx" style="display: block; padding: 0 10px">                } catch ( WPAjaxDieContinueException $e ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,18 +60,18 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        unset( $e );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Get the response

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Get the response.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $xml = simplexml_load_string( $this->_last_response, 'SimpleXMLElement', LIBXML_NOCDATA );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check the meta data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check the meta data.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 1, (string) $xml->response[0]->comments['position'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 0, (string) $xml->response[0]->comments['id'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'get-comments_0', (string) $xml->response['action'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check the payload

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check the payload.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertNotEmpty( (string) $xml->response[0]->comments[0]->response_data );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // And supplemental is empty

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // And supplemental is empty.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEmpty( (string) $xml->response[0]->comments[0]->supplemental );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,15 +83,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_as_subscriber() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Become a subscriber

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Become a subscriber.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_setRole( 'subscriber' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set up a default request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set up a default request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_POST['_ajax_nonce'] = wp_create_nonce( 'get-comments' );

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['action']      = 'get-comments';

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['p']           = self::$comment_post->ID;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->setExpectedException( 'WPAjaxDieStopException', '-1' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->_handleAjax( 'get-comments' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -104,15 +104,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_bad_nonce() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Become an administrator

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Become an administrator.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_setRole( 'administrator' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set up a default request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set up a default request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_POST['_ajax_nonce'] = wp_create_nonce( uniqid() );

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['action']      = 'get-comments';

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['p']           = self::$comment_post->ID;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->setExpectedException( 'WPAjaxDieStopException', '-1' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->_handleAjax( 'get-comments' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -125,15 +125,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_invalid_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">-                // Become an administrator

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Become an administrator.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_setRole( 'administrator' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set up a default request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set up a default request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_POST['_ajax_nonce'] = wp_create_nonce( 'get-comments' );

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['action']      = 'get-comments';

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['p']           = 'b0rk';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->setExpectedException( 'WPAjaxDieStopException', '-1' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->_handleAjax( 'get-comments' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -146,15 +146,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_post_with_no_comments() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Become an administrator

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Become an administrator.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_setRole( 'administrator' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set up a default request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set up a default request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_POST['_ajax_nonce'] = wp_create_nonce( 'get-comments' );

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['action']      = 'get-comments';

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['p']           = self::$no_comment_post->ID;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->setExpectedException( 'WPAjaxDieStopException', '1' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->_handleAjax( 'get-comments' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span></span></pre></div>

<a id="trunktestsphpunittestsajaxManageThemesphp"></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/ajax/ManageThemes.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/ManageThemes.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/ajax/ManageThemes.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,6 @@

</span><span class="cx" style="display: block; padding: 0 10px"> <?php

</span><span class="cx" style="display: block; padding: 0 10px"> /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Admin ajax functions to be tested

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Admin Ajax functions to be tested.

</ins><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> require_once( ABSPATH . 'wp-admin/includes/ajax-actions.php' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunktestsphpunittestsajaxMediaEditphp"></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/ajax/MediaEdit.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/MediaEdit.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/ajax/MediaEdit.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,11 +1,11 @@

</span><span class="cx" style="display: block; padding: 0 10px"> <?php

</span><span class="cx" style="display: block; padding: 0 10px"> /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Admin ajax functions to be tested

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Admin Ajax functions to be tested.

</ins><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> require_once( ABSPATH . 'wp-admin/includes/ajax-actions.php' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Testing ajax media editing

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Testing Ajax media editing.

</ins><span class="cx" style="display: block; padding: 0 10px">  *

</span><span class="cx" style="display: block; padding: 0 10px">  * @package    WordPress

</span><span class="cx" style="display: block; padding: 0 10px">  * @subpackage UnitTests

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,7 +18,7 @@

<span class="cx" style="display: block; padding: 0 10px">         * Tear down the test fixture.

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function tearDown() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Cleanup

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Cleanup.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->remove_added_uploads();

</span><span class="cx" style="display: block; padding: 0 10px">                parent::tearDown();

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span></span></pre></div>

<a id="trunktestsphpunittestsajaxPrivacyErasePersonalDataphp"></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/ajax/PrivacyErasePersonalData.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/PrivacyErasePersonalData.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/ajax/PrivacyErasePersonalData.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -140,7 +140,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'wp_privacy_personal_data_erasers', array( $this, 'register_custom_personal_data_eraser' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->_setRole( 'administrator' );

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // erase_others_personal_data meta cap in Multisite installation is only granted to those with `manage_network` capability.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // `erase_others_personal_data` meta cap in Multisite installation is only granted to those with `manage_network` capability.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( is_multisite() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        grant_super_admin( get_current_user_id() );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -805,7 +805,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">        /**

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Helper function for ajax handler.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Helper function for Ajax handler.

</ins><span class="cx" style="display: block; padding: 0 10px">          *

</span><span class="cx" style="display: block; padding: 0 10px">         * @since 5.2.0

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span></span></pre></div>

<a id="trunktestsphpunittestsajaxPrivacyExportPersonalDataphp"></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/ajax/PrivacyExportPersonalData.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/PrivacyExportPersonalData.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/ajax/PrivacyExportPersonalData.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -154,7 +154,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'wp_privacy_personal_data_exporters', array( $this, 'filter_register_custom_personal_data_exporter' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->_setRole( 'administrator' );

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // export_others_personal_data meta cap in Multisite installation is only granted to those with `manage_network` capability.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // `export_others_personal_data` meta cap in Multisite installation is only granted to those with `manage_network` capability.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( is_multisite() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        grant_super_admin( get_current_user_id() );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -807,7 +807,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">        /**

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Helper function for ajax handler.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Helper function for Ajax handler.

</ins><span class="cx" style="display: block; padding: 0 10px">          *

</span><span class="cx" style="display: block; padding: 0 10px">         * @since 5.2.0

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span></span></pre></div>

<a id="trunktestsphpunittestsajaxQuickEditphp"></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/ajax/QuickEdit.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/QuickEdit.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/ajax/QuickEdit.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,7 +1,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> <?php

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Admin ajax functions to be tested

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Admin Ajax functions to be tested.

</ins><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> require_once( ABSPATH . 'wp-admin/includes/ajax-actions.php' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,11 +75,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        unset( $e );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // wptests_tax_1 terms should have been refused.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // 'wptests_tax_1' terms should have been refused.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post_terms_1 = wp_get_object_terms( $post->ID, 'wptests_tax_1' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEmpty( $post_terms_1 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // wptests_tax_2 terms should have been added successfully.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // 'wptests_tax_2' terms should have been added successfully.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post_terms_2 = wp_get_object_terms( $post->ID, 'wptests_tax_2' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEqualSets( array( $t2 ), wp_list_pluck( $post_terms_2, 'term_id' ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span></span></pre></div>

<a id="trunktestsphpunittestsajaxReplytoCommentphp"></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/ajax/ReplytoComment.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/ReplytoComment.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/ajax/ReplytoComment.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,12 +1,12 @@

</span><span class="cx" style="display: block; padding: 0 10px"> <?php

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Admin ajax functions to be tested

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Admin Ajax functions to be tested.

</ins><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> require_once( ABSPATH . 'wp-admin/includes/ajax-actions.php' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Testing ajax comment functionality

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Testing Ajax comment functionality.

</ins><span class="cx" style="display: block; padding: 0 10px">  *

</span><span class="cx" style="display: block; padding: 0 10px">  * @package    WordPress

</span><span class="cx" style="display: block; padding: 0 10px">  * @subpackage UnitTests

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,10 +50,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_as_admin() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Become an administrator

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Become an administrator.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_setRole( 'administrator' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Get a comment

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Get a comment.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $comments = get_comments(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_id' => self::$comment_post->ID,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -61,13 +61,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $comment  = array_pop( $comments );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set up a default request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set up a default request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_POST['_ajax_nonce-replyto-comment'] = wp_create_nonce( 'replyto-comment' );

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['comment_ID']                  = $comment->comment_ID;

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['content']                     = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.';

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['comment_post_ID']             = self::$comment_post->ID;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 try {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->_handleAjax( 'replyto-comment' );

</span><span class="cx" style="display: block; padding: 0 10px">                } catch ( WPAjaxDieContinueException $e ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -74,18 +74,18 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        unset( $e );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Get the response

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Get the response.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $xml = simplexml_load_string( $this->_last_response, 'SimpleXMLElement', LIBXML_NOCDATA );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check the meta data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check the meta data.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( -1, (string) $xml->response[0]->comment['position'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertGreaterThan( 0, (int) $xml->response[0]->comment['id'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEmpty( (string) $xml->response['action'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check the payload

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check the payload.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertNotEmpty( (string) $xml->response[0]->comment[0]->response_data );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // And supplemental is empty

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // And supplemental is empty.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEmpty( (string) $xml->response[0]->comment[0]->supplemental );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -97,10 +97,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_as_subscriber() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Become an administrator

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Become an administrator.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_setRole( 'subscriber' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Get a comment

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Get a comment.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $comments = get_comments(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_id' => self::$comment_post->ID,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -108,13 +108,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $comment  = array_pop( $comments );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set up a default request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set up a default request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_POST['_ajax_nonce-replyto-comment'] = wp_create_nonce( 'replyto-comment' );

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['comment_ID']                  = $comment->comment_ID;

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['content']                     = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.';

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['comment_post_ID']             = self::$comment_post->ID;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->setExpectedException( 'WPAjaxDieStopException', '-1' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->_handleAjax( 'replyto-comment' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -127,10 +127,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_bad_nonce() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Become an administrator

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Become an administrator.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_setRole( 'administrator' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Get a comment

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Get a comment.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $comments = get_comments(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_id' => self::$comment_post->ID,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -138,13 +138,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $comment  = array_pop( $comments );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set up a default request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set up a default request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_POST['_ajax_nonce-replyto-comment'] = wp_create_nonce( uniqid() );

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['comment_ID']                  = $comment->comment_ID;

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['content']                     = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.';

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['comment_post_ID']             = self::$comment_post->ID;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->setExpectedException( 'WPAjaxDieStopException', '-1' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->_handleAjax( 'replyto-comment' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -157,15 +157,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_invalid_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">-                // Become an administrator

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Become an administrator.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_setRole( 'administrator' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set up a default request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set up a default request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_POST['_ajax_nonce-replyto-comment'] = wp_create_nonce( 'replyto-comment' );

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['content']                     = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.';

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['comment_post_ID']             = 123456789;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->setExpectedException( 'WPAjaxDieStopException', '-1' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->_handleAjax( 'replyto-comment' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -178,15 +178,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_with_draft_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">-                // Become an administrator

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Become an administrator.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_setRole( 'administrator' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set up a default request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set up a default request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_POST['_ajax_nonce-replyto-comment'] = wp_create_nonce( 'replyto-comment' );

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['content']                     = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.';

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['comment_post_ID']             = self::$draft_post->ID;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->setExpectedException( 'WPAjaxDieStopException', 'ERROR: you are replying to a comment on a draft post.' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->_handleAjax( 'replyto-comment' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -201,18 +201,18 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_blocked_comment() {

</span><span class="cx" style="display: block; padding: 0 10px">                global $wpdb;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Become an administrator

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Become an administrator.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_setRole( 'administrator' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set up a default request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set up a default request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_POST['_ajax_nonce-replyto-comment'] = wp_create_nonce( 'replyto-comment' );

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['content']                     = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.';

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['comment_post_ID']             = self::$comment_post->ID;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Block comments from being saved, simulate a DB error

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Block comments from being saved, simulate a DB error.

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_filter( 'query', array( $this, '_block_comments' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 try {

</span><span class="cx" style="display: block; padding: 0 10px">                        $wpdb->suppress_errors( true );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->_handleAjax( 'replyto-comment' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -246,18 +246,18 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_pre_comments_approved() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Become an administrator

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Become an administrator.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_setRole( 'administrator' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set up a default request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set up a default request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_POST['_ajax_nonce-replyto-comment'] = wp_create_nonce( 'replyto-comment' );

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['content']                     = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.';

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['comment_post_ID']             = self::$comment_post->ID;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Simulate filter check error

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Simulate filter check error.

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_filter( 'pre_comment_approved', array( $this, '_pre_comment_approved_filter' ), 10, 2 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->setExpectedException( 'WPAjaxDieStopException', 'pre_comment_approved filter fails for new comment' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->_handleAjax( 'replyto-comment' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span></span></pre></div>

<a id="trunktestsphpunittestsajaxResponsephp"></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/ajax/Response.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/Response.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/ajax/Response.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,6 @@

</span><span class="cx" style="display: block; padding: 0 10px"> <?php

</span><span class="cx" style="display: block; padding: 0 10px"> /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Testing ajax response class

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Testing Ajax response class

</ins><span class="cx" style="display: block; padding: 0 10px">  *

</span><span class="cx" style="display: block; padding: 0 10px">  * @package    WordPress

</span><span class="cx" style="display: block; padding: 0 10px">  * @subpackage UnitTests

</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">                add_filter( 'wp_die_ajax_handler', array( $this, 'getDieHandler' ), 1, 1 );

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'wp_doing_ajax', '__return_true' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Suppress warnings from "Cannot modify header information - headers already sent by"

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Suppress warnings from "Cannot modify header information - headers already sent by".

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_error_level = error_reporting();

</span><span class="cx" style="display: block; padding: 0 10px">                error_reporting( $this->_error_level & ~E_WARNING );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,12 +77,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->markTestSkipped( 'xdebug is required for this test' );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Generate an ajax response

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Generate an Ajax response.

</ins><span class="cx" style="display: block; padding: 0 10px">                 ob_start();

</span><span class="cx" style="display: block; padding: 0 10px">                $ajax_response = new WP_Ajax_Response();

</span><span class="cx" style="display: block; padding: 0 10px">                $ajax_response->send();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check the header

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check the header.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $headers = xdebug_get_headers();

</span><span class="cx" style="display: block; padding: 0 10px">                ob_end_clean();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,12 +96,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_response_charset_in_xml() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Generate an ajax response

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Generate an Ajax response.

</ins><span class="cx" style="display: block; padding: 0 10px">                 ob_start();

</span><span class="cx" style="display: block; padding: 0 10px">                $ajax_response = new WP_Ajax_Response();

</span><span class="cx" style="display: block; padding: 0 10px">                $ajax_response->send();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check the XML tag

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check the XML tag.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $contents = ob_get_clean();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertRegExp( '/<\?xml\s+version=\'1.0\'\s+encoding=\'' . preg_quote( get_option( 'blog_charset' ) ) . '\'\s+standalone=\'yes\'\?>/', $contents );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span></span></pre></div>

<a id="trunktestsphpunittestsajaxTagSearchphp"></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/ajax/TagSearch.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/TagSearch.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/ajax/TagSearch.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,12 +1,12 @@

</span><span class="cx" style="display: block; padding: 0 10px"> <?php

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Admin ajax functions to be tested

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Admin Ajax functions to be tested.

</ins><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> require_once( ABSPATH . 'wp-admin/includes/ajax-actions.php' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Testing ajax tag search functionality

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Testing Ajax tag search functionality.

</ins><span class="cx" style="display: block; padding: 0 10px">  *

</span><span class="cx" style="display: block; padding: 0 10px">  * @package    WordPress

</span><span class="cx" style="display: block; padding: 0 10px">  * @subpackage UnitTests

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,14 +42,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_post_tag() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Become an administrator

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Become an administrator.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_setRole( 'administrator' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set up a default request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set up a default request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_GET['tax'] = 'post_tag';

</span><span class="cx" style="display: block; padding: 0 10px">                $_GET['q']   = 'chat';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 try {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->_handleAjax( 'ajax-tag-search' );

</span><span class="cx" style="display: block; padding: 0 10px">                } catch ( WPAjaxDieContinueException $e ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,7 +56,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        unset( $e );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Ensure we found the right match

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Ensure we found the right match.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $this->_last_response, 'chattels' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,15 +65,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_no_results() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Become an administrator

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Become an administrator.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_setRole( 'administrator' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set up a default request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set up a default request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_GET['tax'] = 'post_tag';

</span><span class="cx" style="display: block; padding: 0 10px">                $_GET['q']   = md5( uniqid() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make the request

-               // No output, so we get a stop exception

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make the request.

+               // No output, so we get a stop exception.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->setExpectedException( 'WPAjaxDieStopException', '' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->_handleAjax( 'ajax-tag-search' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,14 +83,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_with_comma() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Become an administrator

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Become an administrator.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_setRole( 'administrator' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set up a default request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set up a default request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_GET['tax'] = 'post_tag';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $_GET['q']   = 'some,nonsense, terms,chat'; // Only the last term in the list is searched

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $_GET['q']   = 'some,nonsense, terms,chat'; // Only the last term in the list is searched.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 try {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->_handleAjax( 'ajax-tag-search' );

</span><span class="cx" style="display: block; padding: 0 10px">                } catch ( WPAjaxDieContinueException $e ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -97,7 +97,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        unset( $e );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Ensure we found the right match

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Ensure we found the right match.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $this->_last_response, 'chattels' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,14 +106,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_logged_out() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Log out

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Log out.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_logout();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set up a default request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set up a default request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_GET['tax'] = 'post_tag';

</span><span class="cx" style="display: block; padding: 0 10px">                $_GET['q']   = 'chat';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->setExpectedException( 'WPAjaxDieStopException', '-1' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->_handleAjax( 'ajax-tag-search' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -123,14 +123,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_invalid_tax() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Become an administrator

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Become an administrator.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_setRole( 'administrator' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set up a default request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set up a default request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_GET['tax'] = 'invalid-taxonomy';

</span><span class="cx" style="display: block; padding: 0 10px">                $_GET['q']   = 'chat';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->setExpectedException( 'WPAjaxDieStopException', '0' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->_handleAjax( 'ajax-tag-search' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -140,14 +140,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_unprivileged_user() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Become an administrator

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Become a subscriber.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_setRole( 'subscriber' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set up a default request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set up a default request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_GET['tax'] = 'post_tag';

</span><span class="cx" style="display: block; padding: 0 10px">                $_GET['q']   = 'chat';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->setExpectedException( 'WPAjaxDieStopException', '-1' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->_handleAjax( 'ajax-tag-search' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span></span></pre></div>

<a id="trunktestsphpunittestsajaxUpdatePluginphp"></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/ajax/UpdatePlugin.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/UpdatePlugin.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/ajax/UpdatePlugin.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,6 @@

</span><span class="cx" style="display: block; padding: 0 10px"> <?php

</span><span class="cx" style="display: block; padding: 0 10px"> /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Admin ajax functions to be tested

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Admin Ajax functions to be tested.

</ins><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> require_once( ABSPATH . 'wp-admin/includes/ajax-actions.php' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,7 +22,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['_ajax_nonce'] = wp_create_nonce( 'updates' );

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['slug']        = 'foo';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 try {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->_handleAjax( 'update-plugin' );

</span><span class="cx" style="display: block; padding: 0 10px">                } catch ( WPAjaxDieContinueException $e ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,7 +48,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['_ajax_nonce'] = wp_create_nonce( 'updates' );

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['plugin']      = 'foo/bar.php';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 try {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->_handleAjax( 'update-plugin' );

</span><span class="cx" style="display: block; padding: 0 10px">                } catch ( WPAjaxDieContinueException $e ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,7 +75,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['plugin']      = 'foo/bar.php';

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['slug']        = 'foo';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 try {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->_handleAjax( 'update-plugin' );

</span><span class="cx" style="display: block; padding: 0 10px">                } catch ( WPAjaxDieContinueException $e ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,7 +106,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['plugin']      = '../foo/bar.php';

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['slug']        = 'foo';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 try {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->_handleAjax( 'update-plugin' );

</span><span class="cx" style="display: block; padding: 0 10px">                } catch ( WPAjaxDieContinueException $e ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -137,9 +137,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['plugin']      = 'hello.php';

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['slug']        = 'hello-dolly';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 try {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Prevent wp_update_plugins() from running

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Prevent wp_update_plugins() from running.

</ins><span class="cx" style="display: block; padding: 0 10px">                         wp_installing( true );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->_handleAjax( 'update-plugin' );

</span><span class="cx" style="display: block; padding: 0 10px">                        wp_installing( false );

</span></span></pre></div>

<a id="trunktestsphpunittestsattachmentslashesphp"></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/attachment/slashes.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/attachment/slashes.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/attachment/slashes.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,8 +11,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->author_id = self::factory()->user->create( array( 'role' => 'editor' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                wp_set_current_user( $this->author_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">-                // it is important to test with both even and odd numbered slashes as

-               // kses does a strip-then-add slashes in some of its function calls

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // It is important to test with both even and odd numbered slashes,

+               // as KSES does a strip-then-add slashes in some of its function calls.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->slash_1 = 'String with 1 slash \\';

</span><span class="cx" style="display: block; padding: 0 10px">                $this->slash_2 = 'String with 2 slashes \\\\';

</span><span class="cx" style="display: block; padding: 0 10px">                $this->slash_3 = 'String with 3 slashes \\\\\\';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,7 +23,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Tests the model function that expects slashed data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Tests the model function that expects slashed data.

</ins><span class="cx" style="display: block; padding: 0 10px">          */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wp_insert_attachment() {

</span><span class="cx" style="display: block; padding: 0 10px">                $id   = wp_insert_attachment(

</span></span></pre></div>

<a id="trunktestsphpunittestsauthphp"></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/auth.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/auth.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/auth.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,7 +11,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        protected static $wp_hasher;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * action hook

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Action hook.

</ins><span class="cx" style="display: block; padding: 0 10px">          */

</span><span class="cx" style="display: block; padding: 0 10px">        protected $nonce_failure_hook = 'wp_verify_nonce_failed';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,11 +57,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_auth_cookie_scheme() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // arbitrary scheme name

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Arbitrary scheme name.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $cookie = wp_generate_auth_cookie( self::$user_id, time() + 3600, 'foo' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( self::$user_id, wp_validate_auth_cookie( $cookie, 'foo' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // wrong scheme name - should fail

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Wrong scheme name - should fail.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $cookie = wp_generate_auth_cookie( self::$user_id, time() + 3600, 'foo' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( false, wp_validate_auth_cookie( $cookie, 'bar' ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -157,7 +157,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_check_admin_referer_with_no_action_triggers_doing_it_wrong() {

</span><span class="cx" style="display: block; padding: 0 10px">                $this->setExpectedIncorrectUsage( 'check_admin_referer' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // A valid nonce needs to be set so the check doesn't die()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // A valid nonce needs to be set so the check doesn't die().

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_REQUEST['_wpnonce'] = wp_create_nonce( -1 );

</span><span class="cx" style="display: block; padding: 0 10px">                $result               = check_admin_referer();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( 1, $result );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -166,7 +166,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_check_admin_referer_with_default_action_as_string_not_doing_it_wrong() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // A valid nonce needs to be set so the check doesn't die()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // A valid nonce needs to be set so the check doesn't die().

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_REQUEST['_wpnonce'] = wp_create_nonce( '-1' );

</span><span class="cx" style="display: block; padding: 0 10px">                $result               = check_admin_referer( '-1' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( 1, $result );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -180,7 +180,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_check_ajax_referer_with_no_action_triggers_doing_it_wrong() {

</span><span class="cx" style="display: block; padding: 0 10px">                $this->setExpectedIncorrectUsage( 'check_ajax_referer' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // A valid nonce needs to be set so the check doesn't die()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // A valid nonce needs to be set so the check doesn't die().

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_REQUEST['_wpnonce'] = wp_create_nonce( -1 );

</span><span class="cx" style="display: block; padding: 0 10px">                $result               = check_ajax_referer();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( 1, $result );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -192,11 +192,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $limit = str_repeat( 'a', 4096 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                wp_set_password( $limit, self::$user_id );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // phpass hashed password

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // phpass hashed password.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertStringStartsWith( '$P$', $this->user->data->user_pass );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $user = wp_authenticate( $this->user->user_login, 'aaaaaaaa' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Wrong Password

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Wrong password.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertInstanceOf( 'WP_Error', $user );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $user = wp_authenticate( $this->user->user_login, $limit );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -203,9 +203,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'WP_User', $user );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( self::$user_id, $user->ID );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // one char too many

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // One char too many.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $user = wp_authenticate( $this->user->user_login, $limit . 'a' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Wrong Password

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Wrong password.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertInstanceOf( 'WP_Error', $user );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                wp_set_password( $limit . 'a', self::$user_id );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -223,11 +223,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'WP_Error', $user );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $user = wp_authenticate( $this->user->user_login, 'aaaaaaaa' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Wrong Password

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Wrong password.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertInstanceOf( 'WP_Error', $user );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $user = wp_authenticate( $this->user->user_login, $limit );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Wrong Password

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Wrong password.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertInstanceOf( 'WP_Error', $user );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $user = wp_authenticate( $this->user->user_login, $limit . 'a' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -242,7 +242,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $user = get_userdata( $this->user->ID );

</span><span class="cx" style="display: block; padding: 0 10px">                $key  = get_password_reset_key( $user );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // A correctly saved key should be accepted

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // A correctly saved key should be accepted.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $check = check_password_reset_key( $key, $this->user->user_login );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotWPError( $check );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'WP_User', $check );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -267,21 +267,21 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                clean_user_cache( $this->user );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // A valid key should be accepted

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // A valid key should be accepted.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $check = check_password_reset_key( $key, $this->user->user_login );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotWPError( $check );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'WP_User', $check );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( $this->user->ID, $check->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">-                // An invalid key should be rejected

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // An invalid key should be rejected.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $check = check_password_reset_key( 'key', $this->user->user_login );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'WP_Error', $check );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // An empty key should be rejected

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // An empty key should be rejected.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $check = check_password_reset_key( '', $this->user->user_login );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'WP_Error', $check );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // A truncated key should be rejected

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // A truncated key should be rejected.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $partial = substr( $key, 0, 10 );

</span><span class="cx" style="display: block; padding: 0 10px">                $check   = check_password_reset_key( $partial, $this->user->user_login );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'WP_Error', $check );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -305,7 +305,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                clean_user_cache( $this->user );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // An expired but otherwise valid key should be rejected

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // An expired but otherwise valid key should be rejected.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $check = check_password_reset_key( $key, $this->user->user_login );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'WP_Error', $check );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -314,11 +314,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 32429

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_empty_user_activation_key_fails_key_check() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // An empty user_activation_key should not allow any key to be accepted

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // An empty user_activation_key should not allow any key to be accepted.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $check = check_password_reset_key( 'key', $this->user->user_login );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'WP_Error', $check );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // An empty user_activation_key should not allow an empty key to be accepted

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // An empty user_activation_key should not allow an empty key to be accepted.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $check = check_password_reset_key( '', $this->user->user_login );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'WP_Error', $check );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -343,11 +343,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                clean_user_cache( $this->user );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // A legacy user_activation_key should not be accepted

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // A legacy user_activation_key should not be accepted.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $check = check_password_reset_key( $key, $this->user->user_login );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'WP_Error', $check );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // An empty key with a legacy user_activation_key should be rejected

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // An empty key with a legacy user_activation_key should be rejected.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $check = check_password_reset_key( '', $this->user->user_login );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'WP_Error', $check );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -373,11 +373,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                clean_user_cache( $this->user );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // A plaintext user_activation_key should not allow an otherwise valid key to be accepted

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // A plaintext user_activation_key should not allow an otherwise valid key to be accepted.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $check = check_password_reset_key( $key, $this->user->user_login );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'WP_Error', $check );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // A plaintext user_activation_key should not allow an empty key to be accepted

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // A plaintext user_activation_key should not allow an empty key to be accepted.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $check = check_password_reset_key( '', $this->user->user_login );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'WP_Error', $check );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span></span></pre></div>

<a id="trunktestsphpunittestsbasicphp"></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/basic.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/basic.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/basic.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +8,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Basic extends WP_UnitTestCase {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_license() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // This test is designed to only run on trunk/master

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // This test is designed to only run on trunk/master.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->skipOnAutomatedBranches();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $license = file_get_contents( ABSPATH . 'license.txt' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,7 +21,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $package_json    = file_get_contents( dirname( ABSPATH ) . '/package.json' );

</span><span class="cx" style="display: block; padding: 0 10px">                $package_json    = json_decode( $package_json, true );

</span><span class="cx" style="display: block; padding: 0 10px">                list( $version ) = explode( '-', $GLOBALS['wp_version'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // package.json uses x.y.z, so fill cleaned $wp_version for .0 releases

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // package.json uses x.y.z, so fill cleaned $wp_version for .0 releases.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( 1 === substr_count( $version, '.' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $version .= '.0';

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,7 +39,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertRegExp( '~^=?\d+\.\d+\.\d+$~', $node, "package.json's node version cannot be a range." );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // test some helper utility functions

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Test some helper utility functions.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_strip_ws() {

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( '', strip_ws( '' ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,7 +75,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> <p>If a new user is created by WordPress, the password will be set, by default, to "changeme". Quite suggestive, eh? ;)</p>

</span><span class="cx" style="display: block; padding: 0 10px">         <ol id="authors"><form action="?import=wordpress&amp;step=2&amp;id=" method="post"><input type="hidden" name="_wpnonce" value="855ae98911" /><input type="hidden" name="_wp_http_referer" value="wp-test.php" /><li>Current author: <strong>Alex Shiels</strong><br />Create user  <input type="text" value="Alex Shiels" name="user[]" maxlength="30"> <br /> or map to existing<select name="userselect[0]">

</span><span class="cx" style="display: block; padding: 0 10px"> EOF;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // _wpnonce value should be replaced with 'xxx'

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // _wpnonce value should be replaced with 'xxx'.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $expected = <<<EOF

</span><span class="cx" style="display: block; padding: 0 10px"> <h2>Assign Authors</h2>

</span><span class="cx" style="display: block; padding: 0 10px"> <p>To make it easier for you to edit and save the imported posts and drafts, you may want to change the name of the author of the posts. For example, you may want to import all the entries as <code>admin</code>s entries.</p>

</span></span></pre></div>

<a id="trunktestsphpunittestsbookmarkgetBookmarksphp"></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/bookmark/getBookmarks.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/bookmark/getBookmarks.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/bookmark/getBookmarks.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,7 +80,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // equal sets != same order

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Equal sets != same order.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEqualSets( $found1, $found2 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $num_queries < $wpdb->num_queries );

</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">                        $found_ids[] = $bookmark->link_id;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // equal sets != same order.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Equal sets != same order.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEqualSets( $bookmarks, $found_ids );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -117,7 +117,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $found_ids[] = $bookmark->link_id;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // equal sets != same order.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Equal sets != same order.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEqualSets( $bookmarks, $found_ids );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</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">                        $found_ids[] = $bookmark->link_id;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // equal sets != same order.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Equal sets != same order.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEqualSets( $bookmarks, $found_ids );

</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="trunktestsphpunittestscachephp"></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/cache.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/cache.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/cache.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,8 +8,8 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function setUp() {

</span><span class="cx" style="display: block; padding: 0 10px">                parent::setUp();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // create two cache objects with a shared cache dir

-               // this simulates a typical cache situation, two separate requests interacting

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create two cache objects with a shared cache directory.

+               // This simulates a typical cache situation, two separate requests interacting.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->cache =& $this->init_cache();

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,7 +42,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $key = __FUNCTION__;

</span><span class="cx" style="display: block; padding: 0 10px">                $val = 0;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // you can store zero in the cache

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // You can store zero in the cache.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->cache->add( $key, $val );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $val, $this->cache->get( $key ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,7 +52,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $val = null;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $this->cache->add( $key, $val ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // null is converted to empty string

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Null is converted to empty string.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( '', $this->cache->get( $key ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -61,10 +61,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $val1 = 'val1';

</span><span class="cx" style="display: block; padding: 0 10px">                $val2 = 'val2';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // add $key to the cache

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Add $key to the cache.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( $this->cache->add( $key, $val1 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $val1, $this->cache->get( $key ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // $key is in the cache, so reject new calls to add()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // $key is in the cache, so reject new calls to add().

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( $this->cache->add( $key, $val2 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $val1, $this->cache->get( $key ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -74,7 +74,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $val  = 'val1';

</span><span class="cx" style="display: block; padding: 0 10px">                $val2 = 'val2';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // memcached rejects replace() if the key does not exist

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // memcached rejects replace() if the key does not exist.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( $this->cache->replace( $key, $val ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $this->cache->get( $key ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $this->cache->add( $key, $val ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -88,10 +88,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $val1 = 'val1';

</span><span class="cx" style="display: block; padding: 0 10px">                $val2 = 'val2';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // memcached accepts set() if the key does not exist

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // memcached accepts set() if the key does not exist.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( $this->cache->set( $key, $val1 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $val1, $this->cache->get( $key ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Second set() with same key should be allowed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Second set() with same key should be allowed.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( $this->cache->set( $key, $val2 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $val2, $this->cache->get( $key ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,7 +107,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $val = 'val';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->cache->add( $key, $val );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // item is visible to both cache objects

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Item is visible to both cache objects.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $val, $this->cache->get( $key ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->cache->flush();

<span class="cx" style="display: block; padding: 0 10px">                // If there is no value get returns false.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -114,7 +114,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $this->cache->get( $key ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Make sure objects are cloned going to and from the cache

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Make sure objects are cloned going to and from the cache.

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_object_refs() {

</span><span class="cx" style="display: block; padding: 0 10px">                $key           = __FUNCTION__ . '_1';

</span><span class="cx" style="display: block; padding: 0 10px">                $object_a      = new stdClass;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -204,11 +204,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $key = __FUNCTION__;

</span><span class="cx" style="display: block; padding: 0 10px">                $val = 'val';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Verify set

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Verify set.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( $this->cache->set( $key, $val ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $val, $this->cache->get( $key ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Verify successful delete

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Verify successful delete.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( $this->cache->delete( $key ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $this->cache->get( $key ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -219,16 +219,16 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $key = __FUNCTION__;

</span><span class="cx" style="display: block; padding: 0 10px">                $val = 'val';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Verify set

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Verify set.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( wp_cache_set( $key, $val ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $val, wp_cache_get( $key ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Verify successful delete

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Verify successful delete.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( wp_cache_delete( $key ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( wp_cache_get( $key ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // wp_cache_delete() does not have a $force method.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Delete returns (bool) true when key is not set and $force is true

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Delete returns (bool) true when key is not set and $force is true.

</ins><span class="cx" style="display: block; padding: 0 10px">                 // $this->assertTrue( wp_cache_delete( $key, 'default', true ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( wp_cache_delete( $key, 'default' ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -254,7 +254,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->cache->switch_to_blog( get_current_blog_id() );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $val2, $this->cache->get( $key ) );

</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">-                        // Multisite should have separate per-blog caches

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Multisite should have separate per-blog caches.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertTrue( $this->cache->set( $key, $val ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $val, $this->cache->get( $key ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->cache->switch_to_blog( 999 );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -269,7 +269,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $val, $this->cache->get( $key ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Global group

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Global group.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( $this->cache->set( $key, $val, 'global-cache-test' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $val, $this->cache->get( $key, 'global-cache-test' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->cache->switch_to_blog( 999 );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -287,7 +287,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                global $wp_object_cache;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( wp_using_ext_object_cache() ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // External caches will contain property values that contain non-matching resource IDs

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // External caches will contain property values that contain non-matching resource IDs.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertInstanceOf( 'WP_Object_Cache', $wp_object_cache );

</span><span class="cx" style="display: block; padding: 0 10px">                } else {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $wp_object_cache, $new_blank_cache_object );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -301,18 +301,18 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $fake_key = 'my-fake-key';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Save the first value to cache and verify

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Save the first value to cache and verify.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_cache_set( $key, $val1 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $val1, wp_cache_get( $key ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Replace the value and verify

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Replace the value and verify.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_cache_replace( $key, $val2 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $val2, wp_cache_get( $key ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Non-existant key should fail

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Non-existant key should fail.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( wp_cache_replace( $fake_key, $val1 ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make sure $fake_key is not stored

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure $fake_key is not stored.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( wp_cache_get( $fake_key ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span></span></pre></div>

<a id="trunktestsphpunittestscanonicalcategoryphp"></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/canonical/category.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/canonical/category.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/canonical/category.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,9 +30,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        public function data_canonical_category() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                /* Data format:

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /*

+                * Data format:

</ins><span class="cx" style="display: block; padding: 0 10px">                  * [0]: Test URL.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 * [1]: expected results: Any of the following can be used

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+          * [1]: Expected results: Any of the following can be used.

</ins><span class="cx" style="display: block; padding: 0 10px">                  *      array( 'url': expected redirection location, 'qv': expected query vars to be set via the rewrite AND $_GET );

</span><span class="cx" style="display: block; padding: 0 10px">                 *      array( expected query vars to be set, same as 'qv' above )

</span><span class="cx" style="display: block; padding: 0 10px">                 *      (string) expected redirect location

</span></span></pre></div>

<a id="trunktestsphpunittestscanonicalcustomRulesphp"></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/canonical/customRules.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/canonical/customRules.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/canonical/customRules.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,7 +11,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                parent::setUp();

</span><span class="cx" style="display: block; padding: 0 10px">                global $wp_rewrite;

<span class="cx" style="display: block; padding: 0 10px">                // Add a custom Rewrite rule to test category redirections.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $wp_rewrite->add_rule( 'ccr/(.+?)/sort/(asc|desc)', 'index.php?category_name=$matches[1]&order=$matches[2]', 'top' ); // ccr = Custom_Cat_Rule

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $wp_rewrite->add_rule( 'ccr/(.+?)/sort/(asc|desc)', 'index.php?category_name=$matches[1]&order=$matches[2]', 'top' ); // ccr = Custom_Cat_Rule.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $wp_rewrite->flush_rules();

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,9 +23,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function data() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                /* Format:

-                * [0]: $test_url,

-                * [1]: expected results: Any of the following can be used

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /*

+                * Data format:

+                * [0]: Test URL.

+                * [1]: Expected results: Any of the following can be used.

</ins><span class="cx" style="display: block; padding: 0 10px">                  *      array( 'url': expected redirection location, 'qv': expected query vars to be set via the rewrite AND $_GET );

</span><span class="cx" style="display: block; padding: 0 10px">                 *      array( expected query vars to be set, same as 'qv' above )

</span><span class="cx" style="display: block; padding: 0 10px">                 *      (string) expected redirect location

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,7 +33,7 @@

<span class="cx" style="display: block; padding: 0 10px">                 * [3]: (optional) The ticket the test refers to, Can be skipped if unknown.

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                return array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Custom Rewrite rules leading to Categories

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Custom Rewrite rules leading to Categories.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                '/ccr/uncategorized/sort/asc/',

</span><span class="cx" style="display: block; padding: 0 10px">                                array(

</span></span></pre></div>

<a id="trunktestsphpunittestscanonicalnoRewritephp"></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/canonical/noRewrite.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/canonical/noRewrite.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/canonical/noRewrite.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,7 +9,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Canonical_NoRewrite extends WP_Canonical_UnitTestCase {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // These test cases are run against the test handler in WP_Canonical

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // These test cases are run against the test handler in WP_Canonical.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        public function setUp() {

</span><span class="cx" style="display: block; padding: 0 10px">                global $wp_rewrite;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,9 +29,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function data() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                /* Format:

-                * [0]: $test_url,

-                * [1]: expected results: Any of the following can be used

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /*

+                * Test URL.

+                * [0]: Test URL.

+                * [1]: Expected results: Any of the following can be used.

</ins><span class="cx" style="display: block; padding: 0 10px">                  *      array( 'url': expected redirection location, 'qv': expected query vars to be set via the rewrite AND $_GET );

</span><span class="cx" style="display: block; padding: 0 10px">                 *      array( expected query vars to be set, same as 'qv' above )

</span><span class="cx" style="display: block; padding: 0 10px">                 *      (string) expected redirect location

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,14 +41,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">                return array(

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '/?p=123', '/?p=123' ),

</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_type arg should be stripped, because p=1 exists, and does not have post_type= in its query string

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // This post_type arg should be stripped, because p=1 exists, and does not have post_type= in its query string.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( '/?post_type=fake-cpt&p=1', '/?p=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">-                        // Strip an existing but incorrect post_type arg

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Strip an existing but incorrect post_type arg.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( '/?post_type=page&page_id=1', '/?p=1' ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                        // Trailing spaces and punctuation in query string args.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        array(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 array( // Space.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '/?p=358 ',

</span><span class="cx" style="display: block; padding: 0 10px">                                array(

</span><span class="cx" style="display: block; padding: 0 10px">                                        'url' => '/?p=358',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,8 +55,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        'qv'  => array( 'p' => '358' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                ),

</span><span class="cx" style="display: block; padding: 0 10px">                                20383,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        ), // space

-                       array(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 ),

+                       array( // Encoded space.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '/?p=358%20',

</span><span class="cx" style="display: block; padding: 0 10px">                                array(

</span><span class="cx" style="display: block; padding: 0 10px">                                        'url' => '/?p=358',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,8 +63,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        'qv'  => array( 'p' => '358' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                ),

</span><span class="cx" style="display: block; padding: 0 10px">                                20383,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        ), // encoded space

-                       array(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 ),

+                       array( // Exclamation mark.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '/?p=358!',

</span><span class="cx" style="display: block; padding: 0 10px">                                array(

</span><span class="cx" style="display: block; padding: 0 10px">                                        'url' => '/?p=358',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -70,8 +71,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        'qv'  => array( 'p' => '358' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                ),

</span><span class="cx" style="display: block; padding: 0 10px">                                20383,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        ), // exclamation mark

-                       array(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 ),

+                       array( // Encoded exclamation mark.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '/?p=358%21',

</span><span class="cx" style="display: block; padding: 0 10px">                                array(

</span><span class="cx" style="display: block; padding: 0 10px">                                        'url' => '/?p=358',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -78,8 +79,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        'qv'  => array( 'p' => '358' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                ),

</span><span class="cx" style="display: block; padding: 0 10px">                                20383,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        ), // encoded exclamation mark

-                       array(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 ),

+                       array( // Double quote.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '/?p=358"',

</span><span class="cx" style="display: block; padding: 0 10px">                                array(

</span><span class="cx" style="display: block; padding: 0 10px">                                        'url' => '/?p=358',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -86,8 +87,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        'qv'  => array( 'p' => '358' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                ),

</span><span class="cx" style="display: block; padding: 0 10px">                                20383,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        ), // double quote

-                       array(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 ),

+                       array( // Encoded double quote.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '/?p=358%22',

</span><span class="cx" style="display: block; padding: 0 10px">                                array(

</span><span class="cx" style="display: block; padding: 0 10px">                                        'url' => '/?p=358',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,8 +95,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        'qv'  => array( 'p' => '358' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                ),

</span><span class="cx" style="display: block; padding: 0 10px">                                20383,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        ), // encoded double quote

-                       array(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 ),

+                       array( // Single quote.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '/?p=358\'',

</span><span class="cx" style="display: block; padding: 0 10px">                                array(

</span><span class="cx" style="display: block; padding: 0 10px">                                        'url' => '/?p=358',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -102,8 +103,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        'qv'  => array( 'p' => '358' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                ),

</span><span class="cx" style="display: block; padding: 0 10px">                                20383,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        ), // single quote

-                       array(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 ),

+                       array( // Encoded single quote.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '/?p=358%27',

</span><span class="cx" style="display: block; padding: 0 10px">                                array(

</span><span class="cx" style="display: block; padding: 0 10px">                                        'url' => '/?p=358',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -110,8 +111,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        'qv'  => array( 'p' => '358' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                ),

</span><span class="cx" style="display: block; padding: 0 10px">                                20383,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        ), // encoded single quote

-                       array(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 ),

+                       array( // Opening bracket.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '/?p=358(',

</span><span class="cx" style="display: block; padding: 0 10px">                                array(

</span><span class="cx" style="display: block; padding: 0 10px">                                        'url' => '/?p=358',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -118,8 +119,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        'qv'  => array( 'p' => '358' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                ),

</span><span class="cx" style="display: block; padding: 0 10px">                                20383,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        ), // opening bracket

-                       array(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 ),

+                       array( // Encoded opening bracket.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '/?p=358%28',

</span><span class="cx" style="display: block; padding: 0 10px">                                array(

</span><span class="cx" style="display: block; padding: 0 10px">                                        'url' => '/?p=358',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -126,8 +127,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        'qv'  => array( 'p' => '358' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                ),

</span><span class="cx" style="display: block; padding: 0 10px">                                20383,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        ), // encoded opening bracket

-                       array(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 ),

+                       array( // Closing bracket.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '/?p=358)',

</span><span class="cx" style="display: block; padding: 0 10px">                                array(

</span><span class="cx" style="display: block; padding: 0 10px">                                        'url' => '/?p=358',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -134,8 +135,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        'qv'  => array( 'p' => '358' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                ),

</span><span class="cx" style="display: block; padding: 0 10px">                                20383,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        ), // closing bracket

-                       array(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 ),

+                       array( // Encoded closing bracket.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '/?p=358%29',

</span><span class="cx" style="display: block; padding: 0 10px">                                array(

</span><span class="cx" style="display: block; padding: 0 10px">                                        'url' => '/?p=358',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -142,8 +143,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        'qv'  => array( 'p' => '358' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                ),

</span><span class="cx" style="display: block; padding: 0 10px">                                20383,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        ), // encoded closing bracket

-                       array(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 ),

+                       array( // Comma.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '/?p=358,',

</span><span class="cx" style="display: block; padding: 0 10px">                                array(

</span><span class="cx" style="display: block; padding: 0 10px">                                        'url' => '/?p=358',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -150,8 +151,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        'qv'  => array( 'p' => '358' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                ),

</span><span class="cx" style="display: block; padding: 0 10px">                                20383,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        ), // comma

-                       array(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 ),

+                       array( // Encoded comma.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '/?p=358%2C',

</span><span class="cx" style="display: block; padding: 0 10px">                                array(

</span><span class="cx" style="display: block; padding: 0 10px">                                        'url' => '/?p=358',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -158,8 +159,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        'qv'  => array( 'p' => '358' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                ),

</span><span class="cx" style="display: block; padding: 0 10px">                                20383,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        ), // encoded comma

-                       array(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 ),

+                       array( // Period.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '/?p=358.',

</span><span class="cx" style="display: block; padding: 0 10px">                                array(

</span><span class="cx" style="display: block; padding: 0 10px">                                        'url' => '/?p=358',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -166,8 +167,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        'qv'  => array( 'p' => '358' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                ),

</span><span class="cx" style="display: block; padding: 0 10px">                                20383,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        ), // period

-                       array(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 ),

+                       array( // Encoded period.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '/?p=358%2E',

</span><span class="cx" style="display: block; padding: 0 10px">                                array(

</span><span class="cx" style="display: block; padding: 0 10px">                                        'url' => '/?p=358',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -174,8 +175,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        'qv'  => array( 'p' => '358' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                ),

</span><span class="cx" style="display: block; padding: 0 10px">                                20383,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        ), // encoded period

-                       array(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 ),

+                       array( // Semicolon.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '/?p=358;',

</span><span class="cx" style="display: block; padding: 0 10px">                                array(

</span><span class="cx" style="display: block; padding: 0 10px">                                        'url' => '/?p=358',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -182,8 +183,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        'qv'  => array( 'p' => '358' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                ),

</span><span class="cx" style="display: block; padding: 0 10px">                                20383,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        ), // semicolon

-                       array(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 ),

+                       array( // Encoded semicolon.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '/?p=358%3B',

</span><span class="cx" style="display: block; padding: 0 10px">                                array(

</span><span class="cx" style="display: block; padding: 0 10px">                                        'url' => '/?p=358',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -190,8 +191,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        'qv'  => array( 'p' => '358' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                ),

</span><span class="cx" style="display: block; padding: 0 10px">                                20383,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        ), // encoded semicolon

-                       array(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 ),

+                       array( // Opening curly bracket.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '/?p=358{',

</span><span class="cx" style="display: block; padding: 0 10px">                                array(

</span><span class="cx" style="display: block; padding: 0 10px">                                        'url' => '/?p=358',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -198,8 +199,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        'qv'  => array( 'p' => '358' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                ),

</span><span class="cx" style="display: block; padding: 0 10px">                                20383,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        ), // opening curly bracket

-                       array(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 ),

+                       array( // Encoded opening curly bracket.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '/?p=358%7B',

</span><span class="cx" style="display: block; padding: 0 10px">                                array(

</span><span class="cx" style="display: block; padding: 0 10px">                                        'url' => '/?p=358',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -206,8 +207,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        'qv'  => array( 'p' => '358' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                ),

</span><span class="cx" style="display: block; padding: 0 10px">                                20383,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        ), // encoded opening curly bracket

-                       array(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 ),

+                       array( // Closing curly bracket.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '/?p=358}',

</span><span class="cx" style="display: block; padding: 0 10px">                                array(

</span><span class="cx" style="display: block; padding: 0 10px">                                        'url' => '/?p=358',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -214,8 +215,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        'qv'  => array( 'p' => '358' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                ),

</span><span class="cx" style="display: block; padding: 0 10px">                                20383,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        ), // closing curly bracket

-                       array(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 ),

+                       array( // Encoded closing curly bracket.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '/?p=358%7D',

</span><span class="cx" style="display: block; padding: 0 10px">                                array(

</span><span class="cx" style="display: block; padding: 0 10px">                                        'url' => '/?p=358',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -222,8 +223,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        'qv'  => array( 'p' => '358' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                ),

</span><span class="cx" style="display: block; padding: 0 10px">                                20383,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        ), // encoded closing curly bracket

-                       array(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 ),

+                       array( // Encoded opening curly quote.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '/?p=358%E2%80%9C',

</span><span class="cx" style="display: block; padding: 0 10px">                                array(

</span><span class="cx" style="display: block; padding: 0 10px">                                        'url' => '/?p=358',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -230,8 +231,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        'qv'  => array( 'p' => '358' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                ),

</span><span class="cx" style="display: block; padding: 0 10px">                                20383,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        ), // encoded opening curly quote

-                       array(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 ),

+                       array( // Encoded closing curly quote.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '/?p=358%E2%80%9D',

</span><span class="cx" style="display: block; padding: 0 10px">                                array(

</span><span class="cx" style="display: block; padding: 0 10px">                                        'url' => '/?p=358',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -238,35 +239,35 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        'qv'  => array( 'p' => '358' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                ),

</span><span class="cx" style="display: block; padding: 0 10px">                                20383,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        ), // encoded closing curly quote

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 ),

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                        // Trailing spaces and punctuation in permalinks.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        array( '/page/2/ ', '/page/2/', 20383 ), // space

-                       array( '/page/2/%20', '/page/2/', 20383 ), // encoded space

-                       array( '/page/2/!', '/page/2/', 20383 ), // exclamation mark

-                       array( '/page/2/%21', '/page/2/', 20383 ), // encoded exclamation mark

-                       array( '/page/2/"', '/page/2/', 20383 ), // double quote

-                       array( '/page/2/%22', '/page/2/', 20383 ), // encoded double quote

-                       array( '/page/2/\'', '/page/2/', 20383 ), // single quote

-                       array( '/page/2/%27', '/page/2/', 20383 ), // encoded single quote

-                       array( '/page/2/(', '/page/2/', 20383 ), // opening bracket

-                       array( '/page/2/%28', '/page/2/', 20383 ), // encoded opening bracket

-                       array( '/page/2/)', '/page/2/', 20383 ), // closing bracket

-                       array( '/page/2/%29', '/page/2/', 20383 ), // encoded closing bracket

-                       array( '/page/2/,', '/page/2/', 20383 ), // comma

-                       array( '/page/2/%2C', '/page/2/', 20383 ), // encoded comma

-                       array( '/page/2/.', '/page/2/', 20383 ), // period

-                       array( '/page/2/%2E', '/page/2/', 20383 ), // encoded period

-                       array( '/page/2/;', '/page/2/', 20383 ), // semicolon

-                       array( '/page/2/%3B', '/page/2/', 20383 ), // encoded semicolon

-                       array( '/page/2/{', '/page/2/', 20383 ), // opening curly bracket

-                       array( '/page/2/%7B', '/page/2/', 20383 ), // encoded opening curly bracket

-                       array( '/page/2/}', '/page/2/', 20383 ), // closing curly bracket

-                       array( '/page/2/%7D', '/page/2/', 20383 ), // encoded closing curly bracket

-                       array( '/page/2/%E2%80%9C', '/page/2/', 20383 ), // encoded opening curly quote

-                       array( '/page/2/%E2%80%9D', '/page/2/', 20383 ), // encoded closing curly quote

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 array( '/page/2/ ', '/page/2/', 20383 ),   // Space.

+                       array( '/page/2/%20', '/page/2/', 20383 ), // Encoded space.

+                       array( '/page/2/!', '/page/2/', 20383 ),   // Exclamation mark.

+                       array( '/page/2/%21', '/page/2/', 20383 ), // Encoded exclamation mark.

+                       array( '/page/2/"', '/page/2/', 20383 ),   // Double quote.

+                       array( '/page/2/%22', '/page/2/', 20383 ), // Encoded double quote.

+                       array( '/page/2/\'', '/page/2/', 20383 ),  // Single quote.

+                       array( '/page/2/%27', '/page/2/', 20383 ), // Encoded single quote.

+                       array( '/page/2/(', '/page/2/', 20383 ),   // Opening bracket.

+                       array( '/page/2/%28', '/page/2/', 20383 ), // Encoded opening bracket.

+                       array( '/page/2/)', '/page/2/', 20383 ),   // Closing bracket.

+                       array( '/page/2/%29', '/page/2/', 20383 ), // Encoded closing bracket.

+                       array( '/page/2/,', '/page/2/', 20383 ),   // Comma.

+                       array( '/page/2/%2C', '/page/2/', 20383 ), // Encoded comma.

+                       array( '/page/2/.', '/page/2/', 20383 ),   // Period.

+                       array( '/page/2/%2E', '/page/2/', 20383 ), // Encoded period.

+                       array( '/page/2/;', '/page/2/', 20383 ),   // Semicolon.

+                       array( '/page/2/%3B', '/page/2/', 20383 ), // Encoded semicolon.

+                       array( '/page/2/{', '/page/2/', 20383 ),   // Opening curly bracket.

+                       array( '/page/2/%7B', '/page/2/', 20383 ), // Encoded opening curly bracket.

+                       array( '/page/2/}', '/page/2/', 20383 ),   // Closing curly bracket.

+                       array( '/page/2/%7D', '/page/2/', 20383 ), // Encoded closing curly bracket.

+                       array( '/page/2/%E2%80%9C', '/page/2/', 20383 ), // Encoded opening curly quote.

+                       array( '/page/2/%E2%80%9D', '/page/2/', 20383 ), // Encoded closing curly quote.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        array( '/?page_id=1', '/?p=1' ), // redirect page_id to p (should cover page_id|p|attachment_id to one another

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 array( '/?page_id=1', '/?p=1' ), // Redirect page_id to p (should cover page_id|p|attachment_id to one another.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( '/?page_id=1&post_type=revision', '/?p=1' ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '/?feed=rss2&p=1', '/?feed=rss2&p=1', 21841 ),

</span></span></pre></div>

<a id="trunktestsphpunittestscanonicalpageOnFrontphp"></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/canonical/pageOnFront.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/canonical/pageOnFront.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/canonical/pageOnFront.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,9 +40,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function data() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                /* Format:

-                * [0]: $test_url,

-                * [1]: expected results: Any of the following can be used

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /*

+                * Data format:

+                * [0]: Test URL.

+                * [1]: Expected results: Any of the following can be used.

</ins><span class="cx" style="display: block; padding: 0 10px">                  *      array( 'url': expected redirection location, 'qv': expected query vars to be set via the rewrite AND $_GET );

</span><span class="cx" style="display: block; padding: 0 10px">                 *      array( expected query vars to be set, same as 'qv' above )

</span><span class="cx" style="display: block; padding: 0 10px">                 *      (string) expected redirect location

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,13 +50,13 @@

<span class="cx" style="display: block; padding: 0 10px">                 * [3]: (optional) The ticket the test refers to, Can be skipped if unknown.

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                return array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Check against an odd redirect

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Check against an odd redirect.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( '/page/2/', '/page/2/' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '/?page=2', '/page/2/' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '/page/1/', '/' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '/?page=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">-                        // The page designated as the front page should redirect to the front of the site

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // The page designated as the front page should redirect to the front of the site.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( '/front-page/', '/' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '/front-page/2/', '/page/2/' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '/front-page/?page=2', '/page/2/' ),

</span></span></pre></div>

<a id="trunktestsphpunittestscanonicalphp"></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/canonical.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/canonical.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/canonical.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,9 +33,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function data_canonical() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                /* Data format:

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /*

+                * Data format:

</ins><span class="cx" style="display: block; padding: 0 10px">                  * [0]: Test URL.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 * [1]: expected results: Any of the following can be used

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+          * [1]: Expected results: Any of the following can be used.

</ins><span class="cx" style="display: block; padding: 0 10px">                  *      array( 'url': expected redirection location, 'qv': expected query vars to be set via the rewrite AND $_GET );

</span><span class="cx" style="display: block; padding: 0 10px">                 *      array( expected query vars to be set, same as 'qv' above )

</span><span class="cx" style="display: block; padding: 0 10px">                 *      (string) expected redirect location

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,13 +44,13 @@

<span class="cx" style="display: block; padding: 0 10px">                 * [3]: (optional) Array of class/function names expected to throw `_doing_it_wrong()` notices.

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Please Note: A few test cases are commented out below, Look at the test case following it, in most cases it's simply showing 2 options for the "proper" redirect.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Please Note: A few test cases are commented out below, look at the test case following it.

+               // In most cases it's simply showing 2 options for the "proper" redirect.

</ins><span class="cx" style="display: block; padding: 0 10px">                 return array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Categories

-

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Categories.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( '?cat=%d', array( 'url' => '/category/parent/' ), 15256 ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '?cat=%d', array( 'url' => '/category/parent/child-1/' ), 15256 ),

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        array( '?cat=%d', array( 'url' => '/category/parent/child-1/child-2/' ) ), // no children

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 array( '?cat=%d', array( 'url' => '/category/parent/child-1/child-2/' ) ), // No children.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                '/category/uncategorized/',

</span><span class="cx" style="display: block; padding: 0 10px">                                array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -89,7 +90,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                17174,

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Categories & Intersections with other vars

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Categories & intersections with other vars.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                '/category/uncategorized/?tag=post-formats',

</span><span class="cx" style="display: block; padding: 0 10px">                                array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -108,10 +109,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                ),

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Taxonomies with extra Query Vars

-                       array( '/category/cat-a/page/1/?test=one%20two', '/category/cat-a/?test=one%20two', 18086 ), // Extra query vars should stay encoded

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Taxonomies with extra query vars.

+                       array( '/category/cat-a/page/1/?test=one%20two', '/category/cat-a/?test=one%20two', 18086 ), // Extra query vars should stay encoded.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Categories with Dates

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Categories with dates.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                '/2008/04/?cat=1',

</span><span class="cx" style="display: block; padding: 0 10px">                                array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,27 +125,38 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                ),

</span><span class="cx" style="display: block; padding: 0 10px">                                17661,

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        //          array( '/2008/?category_name=cat-a', array( 'url' => '/2008/?category_name=cat-a', 'qv' => array('category_name' => 'cat-a', 'year' => '2008' ) ) ),

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 /*

+                       array(

+                               '/2008/?category_name=cat-a',

+                                       array(

+                                               'url' => '/2008/?category_name=cat-a',

+                                               'qv'  => array(

+                                                       'category_name' => 'cat-a',

+                                                       'year'          => '2008'

+                                               )

+                                       )

+                       ),

+                       */

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                        // Pages

-                                                       array( '/child-page-1/', '/parent-page/child-page-1/' ),

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Pages.

+                       array( '/child-page-1/', '/parent-page/child-page-1/' ),

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( '/?page_id=144', '/parent-page/child-page-1/' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '/abo', '/about/' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '/parent/child1/grandchild/', '/parent/child1/grandchild/' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '/parent/child2/grandchild/', '/parent/child2/grandchild/' ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Posts

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Posts.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( '?p=587', '/2008/06/02/post-format-test-audio/' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '/?name=images-test', '/2008/09/03/images-test/' ),

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Incomplete slug should resolve and remove the ?name= parameter

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Incomplete slug should resolve and remove the ?name= parameter.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( '/?name=images-te', '/2008/09/03/images-test/', 20374 ),

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Page slug should resolve to post slug and remove the ?pagename= parameter

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Page slug should resolve to post slug and remove the ?pagename= parameter.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( '/?pagename=images-test', '/2008/09/03/images-test/', 20374 ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '/2008/06/02/post-format-test-au/', '/2008/06/02/post-format-test-audio/' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '/2008/06/post-format-test-au/', '/2008/06/02/post-format-test-audio/' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '/2008/post-format-test-au/', '/2008/06/02/post-format-test-audio/' ),

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        array( '/2010/post-format-test-au/', '/2008/06/02/post-format-test-audio/' ), // A Year the post is not in

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 array( '/2010/post-format-test-au/', '/2008/06/02/post-format-test-audio/' ), // A year the post is not in.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( '/post-format-test-au/', '/2008/06/02/post-format-test-audio/' ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -163,19 +175,19 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '/2008/09/03/images-test/?page=3', '/2008/09/03/images-test/3/' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '/2008/09/03/images-te?page=3', '/2008/09/03/images-test/3/' ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Comments

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Comments.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( '/2008/03/03/comment-test/?cpage=2', '/2008/03/03/comment-test/comment-page-2/' ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Attachments

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Attachments.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( '/?attachment_id=611', '/2008/06/10/post-format-test-gallery/canola2/' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '/2008/06/10/post-format-test-gallery/?attachment_id=611', '/2008/06/10/post-format-test-gallery/canola2/' ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Dates

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Dates.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( '/?m=2008', '/2008/' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '/?m=200809', '/2008/09/' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '/?m=20080905', '/2008/09/05/' ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        array( '/2008/?day=05', '/2008/?day=05' ), // no redirect

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 array( '/2008/?day=05', '/2008/?day=05' ), // No redirect.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( '/2008/09/?day=05', '/2008/09/05/' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '/2008/?monthnum=9', '/2008/09/' ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -184,22 +196,22 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '/2012/13/', '/2012/' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '/2012/11/51/', '/2012/11/', 0, array( 'WP_Date_Query' ) ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Authors

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Authors.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( '/?author=%d', '/author/canonical-author/' ),

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        //          array( '/?author=%d&year=2008', '/2008/?author=3'),

-                       //          array( '/author/canonical-author/?year=2008', '/2008/?author=3'), //Either or, see previous testcase.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // array( '/?author=%d&year=2008', '/2008/?author=3'),

+                       // array( '/author/canonical-author/?year=2008', '/2008/?author=3'), // Either or, see previous testcase.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Feeds

-                               array( '/?feed=atom', '/feed/atom/' ),

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Feeds.

+                       array( '/?feed=atom', '/feed/atom/' ),

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( '/?feed=rss2', '/feed/' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '/?feed=comments-rss2', '/comments/feed/' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '/?feed=comments-atom', '/comments/feed/atom/' ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Feeds (per-post)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Feeds (per-post).

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( '/2008/03/03/comment-test/?feed=comments-atom', '/2008/03/03/comment-test/feed/atom/' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '/?p=149&feed=comments-atom', '/2008/03/03/comment-test/feed/atom/' ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Index

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Index.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( '/?paged=1', '/' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '/page/1/', '/' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '/page1/', '/' ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -206,11 +218,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '/?paged=2', '/page/2/' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '/page2/', '/page/2/' ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Misc

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Misc.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( '/2008%20', '/2008' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '//2008////', '/2008/' ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Todo: Endpoints (feeds, trackbacks, etc), More fuzzed mixed query variables, comment paging, Home page (Static)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // @todo Endpoints (feeds, trackbacks, etc). More fuzzed mixed query variables, comment paging, Home page (static).

</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="trunktestsphpunittestscategoryphp"></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/category.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/category.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/category.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,14 +20,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @expectedDeprecated get_all_category_ids

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_get_all_category_ids() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // create categories

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Ccreate categories.

</ins><span class="cx" style="display: block; padding: 0 10px">                 self::factory()->category->create_many( 2 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // create new taxonomy to ensure not included

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create new taxonomy to ensure not included.

</ins><span class="cx" style="display: block; padding: 0 10px">                 register_taxonomy( 'test_tax_cat', 'post' );

</span><span class="cx" style="display: block; padding: 0 10px">                wp_insert_term( 'test1', 'test_tax_cat' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Validate length is 1 + created due to uncategorized

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Validate length is 1 + created due to uncategorized.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $cat_ids = get_all_category_ids();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 3, count( $cat_ids ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</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">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_get_category_by_slug() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // create Test Categories

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create test categories.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $testcat  = self::factory()->category->create_and_get(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'slug' => 'testcat',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,13 +51,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // validate category is returned by slug

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Validate category is returned by slug.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $ret_testcat = get_category_by_slug( 'testcat' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $testcat->term_id, $ret_testcat->term_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $ret_testcat = get_category_by_slug( 'TeStCaT' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $testcat->term_id, $ret_testcat->term_id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // validate unknown category returns false

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Validate unknown category returns false.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( get_category_by_slug( 'testcat3' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,7 +67,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test__make_cat_compat() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // create Test Categories and Array Representations

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create test categories and array representations.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $testcat_array            = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'slug'        => 'testmcc',

</span><span class="cx" style="display: block; padding: 0 10px">                        'name'        => 'Test MCC',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -85,7 +85,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $testcat2                  = self::factory()->category->create_and_get( $testcat2_array );

</span><span class="cx" style="display: block; padding: 0 10px">                $testcat2_array['term_id'] = $testcat2->term_id;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // unset properties to enable validation of object

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Unset properties to enable validation of object.

</ins><span class="cx" style="display: block; padding: 0 10px">                 unset( $testcat->cat_ID );

</span><span class="cx" style="display: block; padding: 0 10px">                unset( $testcat->category_count );

</span><span class="cx" style="display: block; padding: 0 10px">                unset( $testcat->category_description );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,13 +100,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                unset( $testcat2->category_nicename );

</span><span class="cx" style="display: block; padding: 0 10px">                unset( $testcat2->category_parent );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // make Compatible

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make compatible.

</ins><span class="cx" style="display: block; padding: 0 10px">                 _make_cat_compat( $testcat );

</span><span class="cx" style="display: block; padding: 0 10px">                _make_cat_compat( $testcat2 );

</span><span class="cx" style="display: block; padding: 0 10px">                _make_cat_compat( $testcat_array );

</span><span class="cx" style="display: block; padding: 0 10px">                _make_cat_compat( $testcat2_array );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Validate Compatibility Object

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Validate compatibility object.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $testcat->cat_ID, $testcat->term_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $testcat->category_count, $testcat->count );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $testcat->category_description, $testcat->description );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -114,7 +114,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $testcat->category_nicename, $testcat->slug );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $testcat->category_parent, $testcat->parent );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Validate Compatibility Object with Parent

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Validate compatibility object with parent.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $testcat->cat_ID, $testcat->term_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $testcat->category_count, $testcat->count );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $testcat->category_description, $testcat->description );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -122,7 +122,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $testcat->category_nicename, $testcat->slug );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $testcat->category_parent, $testcat->parent );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Validate Compatibility Array

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Validate compatibility array.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $testcat_array['cat_ID'], $testcat_array['term_id'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $testcat_array['category_count'], $testcat_array['count'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $testcat_array['category_description'], $testcat_array['description'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -130,7 +130,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $testcat_array['category_nicename'], $testcat_array['slug'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $testcat_array['category_parent'], $testcat_array['parent'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Validate Compatibility Array with Parent

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Validate compatibility array with parent.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $testcat_array['cat_ID'], $testcat_array['term_id'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $testcat_array['category_count'], $testcat_array['count'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $testcat_array['category_description'], $testcat_array['description'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -144,7 +144,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_get_cat_name() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // create Test Category

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create test category.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $testcat = self::factory()->category->create_and_get(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'slug' => 'testcat',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -152,7 +152,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Validate

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Validate.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $testcat->name, get_cat_name( $testcat->term_id ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( '', get_cat_name( -1 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( '', get_cat_name( $testcat->term_id + 100 ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -164,7 +164,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_get_cat_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">-                // create Test Category

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create test category.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $testcat = self::factory()->category->create_and_get(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'slug' => 'testcat',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -172,7 +172,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Validate

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Validate.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $testcat->term_id, get_cat_ID( $testcat->name ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 0, get_cat_ID( 'NO CAT' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 0, get_cat_ID( 12 ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -184,7 +184,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_get_category_by_path() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // create Test Categories

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create test categories.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $root_id           = self::factory()->category->create(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'slug' => 'root',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -198,7 +198,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $root_cat_cat_id   = self::factory()->category->create(

</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">-                                'slug'   => 'cat', //note this is modified on create

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         'slug'   => 'cat', // Note this is modified on create.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'parent' => $root_cat_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">@@ -210,7 +210,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $root_path_cat_id  = self::factory()->category->create(

</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">-                                'slug'   => 'cat', //note this is modified on create

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         'slug'   => 'cat', // Note this is modified on create.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'parent' => $root_path_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">@@ -222,18 +222,18 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $root_level_cat_id = self::factory()->category->create(

</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">-                                'slug'   => 'cat', //note this is modified on create

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         'slug'   => 'cat', // Note this is modified on create.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'parent' => $root_level_id,

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Validate Full Match

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Validate full match.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $ret_cat = get_category_by_path( '/root/level-1', true );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $root_level_id, $ret_cat->term_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNull( get_category_by_path( 'level-1', true ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNull( get_category_by_path( 'nocat/nocat/', 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">-                // Validate Partial Match

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Validate partial match.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $ret_cat = get_category_by_path( 'level-1', false );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $root_level_id, $ret_cat->term_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $ret_cat = get_category_by_path( 'root/cat/level-1', false );

</span></span></pre></div>

<a id="trunktestsphpunittestscommentdateQueryphp"></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/dateQuery.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/dateQuery.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/comment/dateQuery.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,19 +20,19 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function setUp() {

</span><span class="cx" style="display: block; padding: 0 10px">                parent::setUp();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Just some dummy posts to use as parents for comments

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Just some dummy posts to use as parents for comments.

</ins><span class="cx" style="display: block; padding: 0 10px">                 for ( $i = 1; $i <= 2; $i++ ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->posts[ $i ] = self::factory()->post->create();

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Be careful modifying this. Tests are coded to expect this exact sample data.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Format is 'datetime' => 'post number (not ID)'

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Format is 'datetime' => 'post number (not ID)'.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $comment_dates = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        '2007-01-22 03:49:21' => 1,

</span><span class="cx" style="display: block; padding: 0 10px">                        '2007-05-16 17:32:22' => 1,

</span><span class="cx" style="display: block; padding: 0 10px">                        '2007-09-24 07:17:23' => 1,

</span><span class="cx" style="display: block; padding: 0 10px">                        '2008-03-29 09:04:25' => 1,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        '2008-07-15 11:32:26' => 2, // This one should never be in the results

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 '2008-07-15 11:32:26' => 2, // This one should never be in the results.

</ins><span class="cx" style="display: block; padding: 0 10px">                         '2008-12-10 13:06:27' => 1,

</span><span class="cx" style="display: block; padding: 0 10px">                        '2009-06-11 21:30:28' => 1,

</span><span class="cx" style="display: block; padding: 0 10px">                        '2009-12-18 10:42:29' => 1,

</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">                        $args,

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_id' => $this->posts[1],

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                'orderby' => 'comment_ID',  // Same order they were created

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         'orderby' => 'comment_ID',  // Same order they were created.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'order'   => 'ASC',

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span></span></pre></div>

<a id="trunktestsphpunittestscommentgetCommentsPagesCountphp"></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/getCommentsPagesCount.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/getCommentsPagesCount.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/comment/getCommentsPagesCount.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,7 +38,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * Validate get_comments_pages_count for empty comments

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_empty() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //setup post and comments

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Setup post and comments.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post_id = self::factory()->post->create(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_title' => 'comment--post',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,7 +65,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * Validate get_comments_pages_count for treaded comments

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_threaded_comments() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //setup post and comments

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Setup post and comments.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post     = self::factory()->post->create_and_get(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_title' => 'comment--post',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -86,7 +86,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_option_thread_comments() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //setup post and comments

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Setup post and comments.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post     = self::factory()->post->create_and_get(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_title' => 'comment--post',

</span></span></pre></div>

<a id="trunktestsphpunittestscommentgetPageOfCommentphp"></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/getPageOfComment.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/getPageOfComment.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/comment/getPageOfComment.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,21 +9,21 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_last_comment() {

</span><span class="cx" style="display: block; padding: 0 10px">                $p = self::factory()->post->create();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // page 4

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Page 4.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $comment_last = self::factory()->comment->create_post_comments( $p, 1, array( 'comment_date' => '2013-09-24 00:00:00' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                self::factory()->comment->create_post_comments( $p, 1, array( 'comment_date' => '2013-09-23 00:00:00' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // page 3

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Page 3.

</ins><span class="cx" style="display: block; padding: 0 10px">                 self::factory()->comment->create_post_comments( $p, 1, array( 'comment_date' => '2013-09-22 00:00:00' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                self::factory()->comment->create_post_comments( $p, 1, array( 'comment_date' => '2013-09-21 00:00:00' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                self::factory()->comment->create_post_comments( $p, 1, array( 'comment_date' => '2013-09-20 00:00:00' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // page 2

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Page 2.

</ins><span class="cx" style="display: block; padding: 0 10px">                 self::factory()->comment->create_post_comments( $p, 1, array( 'comment_date' => '2013-09-19 00:00:00' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                self::factory()->comment->create_post_comments( $p, 1, array( 'comment_date' => '2013-09-18 00:00:00' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                self::factory()->comment->create_post_comments( $p, 1, array( 'comment_date' => '2013-09-17 00:00:00' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // page 1

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Page 1.

</ins><span class="cx" style="display: block; padding: 0 10px">                 self::factory()->comment->create_post_comments( $p, 1, array( 'comment_date' => '2013-09-16 00:00:00' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                self::factory()->comment->create_post_comments( $p, 1, array( 'comment_date' => '2013-09-15 00:00:00' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $comment_first = self::factory()->comment->create_post_comments( $p, 1, array( 'comment_date' => '2013-09-14 00:00:00' ) );

</span></span></pre></div>

<a id="trunktestsphpunittestscommentqueryphp"></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/query.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/query.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/comment/query.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,6 @@

</span><span class="cx" style="display: block; padding: 0 10px"> <?php

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Test the output of Comment Querying functions

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Test the output of Comment Querying functions.

</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">  * @group comment

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1415,8 +1415,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array( $comment_id3, $comment_id ), wp_list_pluck( $comments, 'comment_ID' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // value1 is present on two different keys for $comment_id yet we should get only one instance

-               // of that comment in the results

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // 'value1' is present on two different keys for $comment_id,

+               // yet we should get only one instance of that comment in the results.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $comments = get_comments(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'meta_value' => 'value1',

</span></span></pre></div>

<a id="trunktestsphpunittestscommentslashesphp"></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/slashes.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/slashes.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/comment/slashes.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,12 +8,12 @@

</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Comment_Slashes extends WP_UnitTestCase {

</span><span class="cx" style="display: block; padding: 0 10px">        function setUp() {

</span><span class="cx" style="display: block; padding: 0 10px">                parent::setUp();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // we need an admin user to bypass comment flood protection

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // We need an admin user to bypass comment flood protection.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->author_id = self::factory()->user->create( array( 'role' => 'administrator' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                wp_set_current_user( $this->author_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">-                // it is important to test with both even and odd numbered slashes as

-               // kses does a strip-then-add slashes in some of its function calls

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // It is important to test with both even and odd numbered slashes,

+               // as KSES does a strip-then-add slashes in some of its function calls.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->slash_1 = 'String with 1 slash \\';

</span><span class="cx" style="display: block; padding: 0 10px">                $this->slash_2 = 'String with 2 slashes \\\\';

</span><span class="cx" style="display: block; padding: 0 10px">                $this->slash_3 = 'String with 3 slashes \\\\\\';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,13 +24,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Tests the extended model function that expects slashed data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Tests the extended model function that expects slashed data.

</ins><span class="cx" style="display: block; padding: 0 10px">          */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wp_new_comment() {

</span><span class="cx" style="display: block; padding: 0 10px">                $post_id = self::factory()->post->create();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // not testing comment_author_email or comment_author_url

-               // as slashes are not permitted in that data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Not testing comment_author_email or comment_author_url

+               // as slashes are not permitted in that data.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $data = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'comment_post_ID'      => $post_id,

</span><span class="cx" style="display: block; padding: 0 10px">                        'comment_author'       => $this->slash_1,

</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">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Tests the controller function that expects slashed data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Tests the controller function that expects slashed data.

</ins><span class="cx" style="display: block; padding: 0 10px">          */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_edit_comment() {

</span><span class="cx" style="display: block; padding: 0 10px">                $post_id    = self::factory()->post->create();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,8 +73,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // not testing comment_author_email or comment_author_url

-               // as slashes are not permitted in that data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Not testing comment_author_email or comment_author_url

+               // as slashes are not permitted in that data.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_POST                            = array();

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['comment_ID']              = $comment_id;

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['comment_status']          = '';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,8 +82,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['newcomment_author_url']   = '';

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['newcomment_author_email'] = '';

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['content']                 = $this->slash_7;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $_POST                            = add_magic_quotes( $_POST );

</del><span class="cx" style="display: block; padding: 0 10px"> 

<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                $_POST = add_magic_quotes( $_POST ); // The edit_comment() function will strip slashes.

+

</ins><span class="cx" style="display: block; padding: 0 10px">                 edit_comment();

</span><span class="cx" style="display: block; padding: 0 10px">                $comment = get_comment( $comment_id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -97,8 +98,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['newcomment_author_url']   = '';

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['newcomment_author_email'] = '';

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['content']                 = $this->slash_4;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $_POST                            = add_magic_quotes( $_POST );

</del><span class="cx" style="display: block; padding: 0 10px"> 

<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                $_POST = add_magic_quotes( $_POST ); // The edit_comment() function will strip slashes.

+

</ins><span class="cx" style="display: block; padding: 0 10px">                 edit_comment();

</span><span class="cx" style="display: block; padding: 0 10px">                $comment = get_comment( $comment_id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,7 +109,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Tests the model function that expects slashed data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Tests the model function that expects slashed data.

</ins><span class="cx" style="display: block; padding: 0 10px">          */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wp_insert_comment() {

</span><span class="cx" style="display: block; padding: 0 10px">                $post_id = self::factory()->post->create();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -138,7 +140,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">-         * Tests the model function that expects slashed data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Tests the model function that expects slashed data.

</ins><span class="cx" style="display: block; padding: 0 10px">          */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wp_update_comment() {

</span><span class="cx" style="display: block; padding: 0 10px">                $post_id    = self::factory()->post->create();

</span></span></pre></div>

<a id="trunktestsphpunittestscommenttemplatephp"></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/template.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/template.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/comment/template.php      2020-01-29 00:43:23 UTC (rev 47122)

</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">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                2,

</span><span class="cx" style="display: block; padding: 0 10px">                                '2 Comments<span class="screen-reader-text"> on Hello % world!</span>',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                '2 Comments<span class="screen-reader-text"> on Hello 2 world!</span>', // See #WP37103

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         '2 Comments<span class="screen-reader-text"> on Hello 2 world!</span>', // See #WP37103.

</ins><span class="cx" style="display: block; padding: 0 10px">                         ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                2,

</span></span></pre></div>

<a id="trunktestsphpunittestscommentwalkerphp"></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/walker.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/walker.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/comment/walker.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,10 +56,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function comment( $comment, $args, $depth ) {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( 1 === $depth ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->test_walker->assertTrue( $this->walker->has_children );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->test_walker->assertTrue( $args['has_children'] ); // Back compat

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->test_walker->assertTrue( $args['has_children'] );  // Back compat.

</ins><span class="cx" style="display: block; padding: 0 10px">                 } elseif ( 2 === $depth ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->test_walker->assertFalse( $this->walker->has_children );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->test_walker->assertFalse( $args['has_children'] ); // Back compat

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->test_walker->assertFalse( $args['has_children'] ); // Back compat.

</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="trunktestsphpunittestscommentwpListCommentsphp"></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/wpListComments.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/wpListComments.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/comment/wpListComments.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,7 +27,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->go_to( get_permalink( $p ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // comments_template() populates $wp_query->comments

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // comments_template() populates $wp_query->comments.

</ins><span class="cx" style="display: block; padding: 0 10px">                 get_echo( 'comments_template' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $found = wp_list_comments(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,7 +65,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->go_to( get_permalink( $p ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // comments_template() populates $wp_query->comments

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // comments_template() populates $wp_query->comments.

</ins><span class="cx" style="display: block; padding: 0 10px">                 get_echo( 'comments_template' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $found = wp_list_comments(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -103,7 +103,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->go_to( get_permalink( $p ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // comments_template() populates $wp_query->comments

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // comments_template() populates $wp_query->comments.

</ins><span class="cx" style="display: block; padding: 0 10px">                 get_echo( 'comments_template' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $found1 = wp_list_comments(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -195,7 +195,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->go_to( get_permalink( $p ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // comments_template() populates $wp_query->comments

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // comments_template() populates $wp_query->comments.

</ins><span class="cx" style="display: block; padding: 0 10px">                 get_echo( 'comments_template' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $found = wp_list_comments(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -243,7 +243,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->go_to( get_permalink( $p ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // comments_template() populates $wp_query->comments

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // comments_template() populates $wp_query->comments.

</ins><span class="cx" style="display: block; padding: 0 10px">                 get_echo( 'comments_template' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $found = wp_list_comments(

</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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/comment-submission.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -152,7 +152,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_submitting_comment_to_scheduled_post_returns_error() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Same error as commenting on a draft

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Same error as commenting on a draft.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $error = 'comment_on_draft';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( 0, did_action( $error ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -491,7 +491,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( defined( 'DISALLOW_UNFILTERED_HTML' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( is_multisite() ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // In multisite, only Super Admins can post unfiltered HTML

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // In multisite, only Super Admins can post unfiltered HTML.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertFalse( user_can( self::$editor_id, 'unfiltered_html' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        grant_super_admin( self::$editor_id );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -521,7 +521,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_privileged_user_cannot_comment_unfiltered_html_without_valid_nonce() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( is_multisite() ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // In multisite, only Super Admins can post unfiltered HTML

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // In multisite, only Super Admins can post unfiltered HTML.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertFalse( user_can( self::$editor_id, 'unfiltered_html' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        grant_super_admin( self::$editor_id );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span></span></pre></div>

<a id="trunktestsphpunittestscommentphp"></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.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/comment.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -192,7 +192,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $found = get_approved_comments( self::$post_id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // all comments types will be returned

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // All comment types will be returned.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( array( $ca1, $ca2, $c2, $c3, $c4, $c5 ), wp_list_pluck( $found, 'comment_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="trunktestsphpunittestscompatphp"></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/compat.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/compat.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/compat.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,7 +7,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Compat extends WP_UnitTestCase {

</span><span class="cx" style="display: block; padding: 0 10px">        function utf8_string_lengths() {

</span><span class="cx" style="display: block; padding: 0 10px">                return array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        //                     string, character_length, byte_length

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // String, character_length, byte_length.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( 'баба', 4, 8 ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( 'баб', 3, 6 ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( 'I am your б', 11, 12 ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,7 +21,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function utf8_substrings() {

</span><span class="cx" style="display: block; padding: 0 10px">                return array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        //               string, start, length, character_substring,   byte_substring

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // String, start, length, character_substring, byte_substring.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( 'баба', 0, 3, 'баб', "б\xD0" ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( 'баба', 0, -1, 'баб', "баб\xD0" ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( 'баба', 1, null, 'аба', "\xB1аба" ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -86,7 +86,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'DEF', _mb_substr( $string_ascii, 3 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'DEF', _mb_substr( $string_ascii, 3, 5, 'ISO-8859-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">-                // specific latin-1 as that is the default the core php test opporates under

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Specific latin-1 as that is the default the core PHP test operates under.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 'peacrOiqng==', base64_encode( _mb_substr( $string_mb, 2, 7, 'latin-1' ) ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( '6Kqe44OG44Kt44K544OI44Gn44GZ', base64_encode( _mb_substr( $string_mb, 2, 7, 'utf-8' ) ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -103,28 +103,28 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        1,

</span><span class="cx" style="display: block; padding: 0 10px">                        12345,

</span><span class="cx" style="display: block; padding: 0 10px">                        -2345,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // float data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Float data.

</ins><span class="cx" style="display: block; padding: 0 10px">                         10.5,

</span><span class="cx" style="display: block; padding: 0 10px">                        -10.5,

</span><span class="cx" style="display: block; padding: 0 10px">                        12.3456789000e10,

</span><span class="cx" style="display: block; padding: 0 10px">                        12.3456789000E-10,

</span><span class="cx" style="display: block; padding: 0 10px">                        .5,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // null data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Null data.

</ins><span class="cx" style="display: block; padding: 0 10px">                         null,

</span><span class="cx" style="display: block; padding: 0 10px">                        null,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // boolean data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Boolean data.

</ins><span class="cx" style="display: block; padding: 0 10px">                         true,

</span><span class="cx" style="display: block; padding: 0 10px">                        false,

</span><span class="cx" style="display: block; padding: 0 10px">                        true,

</span><span class="cx" style="display: block; padding: 0 10px">                        false,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // empty data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Empty data.

</ins><span class="cx" style="display: block; padding: 0 10px">                         '',

</span><span class="cx" style="display: block; padding: 0 10px">                        '',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // string data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // String data.

</ins><span class="cx" style="display: block; padding: 0 10px">                         'string',

</span><span class="cx" style="display: block; padding: 0 10px">                        'string',

</span><span class="cx" style="display: block; padding: 0 10px">                        $heredoc,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // object data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Object data.

</ins><span class="cx" style="display: block; padding: 0 10px">                         new ClassA(),

</span><span class="cx" style="display: block; padding: 0 10px">                        // phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged -- intentionally undefined data

</span><span class="cx" style="display: block; padding: 0 10px">                        @$undefined_var,

</span></span></pre></div>

<a id="trunktestsphpunittestscronphp"></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/cron.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/cron.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/cron.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,7 +18,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function setUp() {

</span><span class="cx" style="display: block; padding: 0 10px">                parent::setUp();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // make sure the schedule is clear

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure the schedule is clear.

</ins><span class="cx" style="display: block; padding: 0 10px">                 _set_cron_array( array() );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->preflight_cron_array = array();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->plus_thirty_minutes  = strtotime( '+30 minutes' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,19 +25,19 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function tearDown() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // make sure the schedule is clear

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure the schedule is clear.

</ins><span class="cx" style="display: block; padding: 0 10px">                 _set_cron_array( array() );

</span><span class="cx" style="display: block; padding: 0 10px">                parent::tearDown();

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wp_get_schedule_empty() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // nothing scheduled

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Nothing scheduled.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $hook = __FUNCTION__;

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( wp_get_schedule( $hook ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_schedule_event_single() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // schedule an event and make sure it's returned by wp_next_scheduled

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Schedule an event and make sure it's returned by wp_next_scheduled().

</ins><span class="cx" style="display: block; padding: 0 10px">                 $hook      = __FUNCTION__;

</span><span class="cx" style="display: block; padding: 0 10px">                $timestamp = strtotime( '+1 hour' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -45,13 +45,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $scheduled );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $timestamp, wp_next_scheduled( $hook ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // it's a non recurring event

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // It's a non-recurring event.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( '', wp_get_schedule( $hook ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_schedule_event_single_args() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // schedule an event with arguments and make sure it's returned by wp_next_scheduled

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Schedule an event with arguments and make sure it's returned by wp_next_scheduled().

</ins><span class="cx" style="display: block; padding: 0 10px">                 $hook      = 'event';

</span><span class="cx" style="display: block; padding: 0 10px">                $timestamp = strtotime( '+1 hour' );

</span><span class="cx" style="display: block; padding: 0 10px">                $args      = array( 'foo' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -58,18 +58,18 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $scheduled = wp_schedule_single_event( $timestamp, $hook, $args );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $scheduled );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // this returns the timestamp only if we provide matching args

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // This returns the timestamp only if we provide matching args.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $timestamp, wp_next_scheduled( $hook, $args ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // these don't match so return nothing

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // These don't match so return nothing.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( false, wp_next_scheduled( $hook ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( false, wp_next_scheduled( $hook, array( 'bar' ) ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // it's a non recurring event

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // It's a non-recurring event.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( '', wp_get_schedule( $hook, $args ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_schedule_event() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // schedule an event and make sure it's returned by wp_next_scheduled

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Schedule an event and make sure it's returned by wp_next_scheduled().

</ins><span class="cx" style="display: block; padding: 0 10px">                 $hook      = __FUNCTION__;

</span><span class="cx" style="display: block; padding: 0 10px">                $recur     = 'hourly';

</span><span class="cx" style="display: block; padding: 0 10px">                $timestamp = strtotime( '+1 hour' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,14 +76,14 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $scheduled = wp_schedule_event( $timestamp, $recur, $hook );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $scheduled );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // it's scheduled for the right time

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // It's scheduled for the right time.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $timestamp, wp_next_scheduled( $hook ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // it's a recurring event

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // It's a recurring event.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $recur, wp_get_schedule( $hook ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_schedule_event_args() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // schedule an event and make sure it's returned by wp_next_scheduled

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Schedule an event and make sure it's returned by wp_next_scheduled().

</ins><span class="cx" style="display: block; padding: 0 10px">                 $hook      = 'event';

</span><span class="cx" style="display: block; padding: 0 10px">                $timestamp = strtotime( '+1 hour' );

</span><span class="cx" style="display: block; padding: 0 10px">                $recur     = 'hourly';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,9 +91,9 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $scheduled = wp_schedule_event( $timestamp, 'hourly', $hook, $args );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $scheduled );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // this returns the timestamp only if we provide matching args

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // This returns the timestamp only if we provide matching args.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $timestamp, wp_next_scheduled( $hook, $args ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // these don't match so return nothing

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // These don't match so return nothing.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( false, wp_next_scheduled( $hook ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( false, wp_next_scheduled( $hook, array( 'bar' ) ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -102,7 +102,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_unschedule_event() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // schedule an event and make sure it's returned by wp_next_scheduled

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Schedule an event and make sure it's returned by wp_next_scheduled().

</ins><span class="cx" style="display: block; padding: 0 10px">                 $hook      = __FUNCTION__;

</span><span class="cx" style="display: block; padding: 0 10px">                $timestamp = strtotime( '+1 hour' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</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">                wp_schedule_single_event( $timestamp, $hook );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $timestamp, wp_next_scheduled( $hook ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // now unschedule it and make sure it's gone

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Now unschedule it and make sure it's gone.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $unscheduled = wp_unschedule_event( $timestamp, $hook );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $unscheduled );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( false, wp_next_scheduled( $hook ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -119,25 +119,25 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $hook = __FUNCTION__;

</span><span class="cx" style="display: block; padding: 0 10px">                $args = array( 'arg1' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // schedule several events with and without arguments

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Schedule several events with and without arguments.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_schedule_single_event( strtotime( '+1 hour' ), $hook );

</span><span class="cx" style="display: block; padding: 0 10px">                wp_schedule_single_event( strtotime( '+2 hour' ), $hook );

</span><span class="cx" style="display: block; padding: 0 10px">                wp_schedule_single_event( strtotime( '+3 hour' ), $hook, $args );

</span><span class="cx" style="display: block; padding: 0 10px">                wp_schedule_single_event( strtotime( '+4 hour' ), $hook, $args );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // make sure they're returned by wp_next_scheduled()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure they're returned by wp_next_scheduled().

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( wp_next_scheduled( $hook ) > 0 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( wp_next_scheduled( $hook, $args ) > 0 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // clear the schedule for the no args events and make sure it's gone

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Clear the schedule for the no args events and make sure it's gone.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $hook_unscheduled = wp_clear_scheduled_hook( $hook );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( 2, $hook_unscheduled );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( wp_next_scheduled( $hook ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // the args events should still be there

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // The args events should still be there.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( wp_next_scheduled( $hook, $args ) > 0 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // clear the schedule for the args events and make sure they're gone too

-               // note: wp_clear_scheduled_hook() expects args passed directly, rather than as an array

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Clear the schedule for the args events and make sure they're gone too.

+               // Note: wp_clear_scheduled_hook() expects args passed directly, rather than as an array.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_clear_scheduled_hook( $hook, $args );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( wp_next_scheduled( $hook, $args ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</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">                wp_schedule_single_event( strtotime( '+1 hour' ), $hook, $args );

</span><span class="cx" style="display: block; padding: 0 10px">                wp_schedule_single_event( strtotime( '+2 hour' ), $hook, $args );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // clear the schedule for no args events and ensure no events are cleared.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Clear the schedule for no args events and ensure no events are cleared.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $hook_unscheduled = wp_clear_scheduled_hook( $hook );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( 0, $hook_unscheduled );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -158,24 +158,24 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $hook = __FUNCTION__;

</span><span class="cx" style="display: block; padding: 0 10px">                $args = array( 'arg1', 'arg2' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // schedule several events with and without arguments

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Schedule several events with and without arguments.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_schedule_single_event( strtotime( '+1 hour' ), $hook );

</span><span class="cx" style="display: block; padding: 0 10px">                wp_schedule_single_event( strtotime( '+2 hour' ), $hook );

</span><span class="cx" style="display: block; padding: 0 10px">                wp_schedule_single_event( strtotime( '+3 hour' ), $hook, $args );

</span><span class="cx" style="display: block; padding: 0 10px">                wp_schedule_single_event( strtotime( '+4 hour' ), $hook, $args );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // make sure they're returned by wp_next_scheduled()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure they're returned by wp_next_scheduled().

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( wp_next_scheduled( $hook ) > 0 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( wp_next_scheduled( $hook, $args ) > 0 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // clear the schedule for the no args events and make sure it's gone

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Clear the schedule for the no args events and make sure it's gone.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_clear_scheduled_hook( $hook );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( wp_next_scheduled( $hook ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // the args events should still be there

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // The args events should still be there.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( wp_next_scheduled( $hook, $args ) > 0 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // clear the schedule for the args events and make sure they're gone too

-               // note: wp_clear_scheduled_hook() used to expect args passed directly, rather than as an array pre WP 3.0

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Clear the schedule for the args events and make sure they're gone too.

+               // Note: wp_clear_scheduled_hook() used to expect args passed directly, rather than as an array pre WP 3.0.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_clear_scheduled_hook( $hook, $args );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( wp_next_scheduled( $hook, $args ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -189,7 +189,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $multi_hook = __FUNCTION__ . '_multi';

</span><span class="cx" style="display: block; padding: 0 10px">                $multi_args = array( 'arg2', 'arg3' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // schedule several events with and without arguments

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Schedule several events with and without arguments.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_schedule_single_event( strtotime( '+1 hour' ), $hook );

</span><span class="cx" style="display: block; padding: 0 10px">                wp_schedule_single_event( strtotime( '+2 hour' ), $hook );

</span><span class="cx" style="display: block; padding: 0 10px">                wp_schedule_single_event( strtotime( '+3 hour' ), $hook, $args );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -197,23 +197,23 @@

</span><span class="cx" style="display: block; padding: 0 10px">                wp_schedule_single_event( strtotime( '+5 hour' ), $multi_hook, $multi_args );

</span><span class="cx" style="display: block; padding: 0 10px">                wp_schedule_single_event( strtotime( '+6 hour' ), $multi_hook, $multi_args );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // make sure they're returned by wp_next_scheduled()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure they're returned by wp_next_scheduled().

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( wp_next_scheduled( $hook ) > 0 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( wp_next_scheduled( $hook, $args ) > 0 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // clear the schedule for the no args events and make sure it's gone

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Clear the schedule for the no args events and make sure it's gone.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_clear_scheduled_hook( $hook );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( wp_next_scheduled( $hook ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // the args events should still be there

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // The args events should still be there.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( wp_next_scheduled( $hook, $args ) > 0 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // clear the schedule for the args events and make sure they're gone too

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Clear the schedule for the args events and make sure they're gone too.

</ins><span class="cx" style="display: block; padding: 0 10px">                 // wp_clear_scheduled_hook() should take args as an array like the other functions.

</span><span class="cx" style="display: block; padding: 0 10px">                wp_clear_scheduled_hook( $hook, $args );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( wp_next_scheduled( $hook, $args ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // clear the schedule for the args events and make sure they're gone too

-               // wp_clear_scheduled_hook() should take args as an array like the other functions and does from WP 3.0

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Clear the schedule for the args events and make sure they're gone too.

+               // wp_clear_scheduled_hook() should take args as an array like the other functions and does from WP 3.0.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_clear_scheduled_hook( $multi_hook, $multi_args );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( wp_next_scheduled( $multi_hook, $multi_args ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -225,17 +225,17 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $hook = __FUNCTION__;

</span><span class="cx" style="display: block; padding: 0 10px">                $args = array( rand_str() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // schedule several events with and without arguments.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Schedule several events with and without arguments.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_schedule_single_event( strtotime( '+1 hour' ), $hook );

</span><span class="cx" style="display: block; padding: 0 10px">                wp_schedule_single_event( strtotime( '+2 hour' ), $hook );

</span><span class="cx" style="display: block; padding: 0 10px">                wp_schedule_single_event( strtotime( '+3 hour' ), $hook, $args );

</span><span class="cx" style="display: block; padding: 0 10px">                wp_schedule_single_event( strtotime( '+4 hour' ), $hook, $args );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // make sure they're returned by wp_next_scheduled().

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure they're returned by wp_next_scheduled().

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( wp_next_scheduled( $hook ) > 0 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( wp_next_scheduled( $hook, $args ) > 0 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // clear the schedule and make sure it's gone.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Clear the schedule and make sure it's gone.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $unschedule_hook = wp_unschedule_hook( $hook );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( 4, $unschedule_hook );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( wp_next_scheduled( $hook ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -263,18 +263,18 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 6966

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_duplicate_event() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // duplicate events close together should be skipped

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Duplicate events close together should be skipped.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $hook = __FUNCTION__;

</span><span class="cx" style="display: block; padding: 0 10px">                $args = array( 'arg1' );

</span><span class="cx" style="display: block; padding: 0 10px">                $ts1  = strtotime( '+5 minutes' );

</span><span class="cx" style="display: block; padding: 0 10px">                $ts2  = strtotime( '+3 minutes' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // first one works

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // First one works.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( wp_schedule_single_event( $ts1, $hook, $args ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // second one is ignored

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Second one is ignored.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( wp_schedule_single_event( $ts2, $hook, $args ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // the next event should be at +5 minutes, not +3

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // The next event should be at +5 minutes, not +3.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $ts1, wp_next_scheduled( $hook, $args ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -282,40 +282,40 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 6966

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_not_duplicate_event() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // duplicate events far apart should work normally

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Duplicate events far apart should work normally.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $hook = __FUNCTION__;

</span><span class="cx" style="display: block; padding: 0 10px">                $args = array( 'arg1' );

</span><span class="cx" style="display: block; padding: 0 10px">                $ts1  = strtotime( '+30 minutes' );

</span><span class="cx" style="display: block; padding: 0 10px">                $ts2  = strtotime( '+3 minutes' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // first one works

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // First one works.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( wp_schedule_single_event( $ts1, $hook, $args ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // second works too

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Second works too.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( wp_schedule_single_event( $ts2, $hook, $args ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // the next event should be at +3 minutes, even though that one was scheduled second

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // The next event should be at +3 minutes, even though that one was scheduled second.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $ts2, wp_next_scheduled( $hook, $args ) );

</span><span class="cx" style="display: block; padding: 0 10px">                wp_unschedule_event( $ts2, $hook, $args );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // following event at +30 minutes should be there too

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Following event at +30 minutes should be there too.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $ts1, wp_next_scheduled( $hook, $args ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_not_duplicate_event_reversed() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // duplicate events far apart should work normally regardless of order

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Duplicate events far apart should work normally regardless of order.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $hook = __FUNCTION__;

</span><span class="cx" style="display: block; padding: 0 10px">                $args = array( 'arg1' );

</span><span class="cx" style="display: block; padding: 0 10px">                $ts1  = strtotime( '+3 minutes' );

</span><span class="cx" style="display: block; padding: 0 10px">                $ts2  = strtotime( '+30 minutes' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // first one works

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // First one works.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( wp_schedule_single_event( $ts1, $hook, $args ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // second works too

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Second works too.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( wp_schedule_single_event( $ts2, $hook, $args ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // the next event should be at +3 minutes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // The next event should be at +3 minutes.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $ts1, wp_next_scheduled( $hook, $args ) );

</span><span class="cx" style="display: block; padding: 0 10px">                wp_unschedule_event( $ts1, $hook, $args );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // following event should be there too

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Following event should be there too.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $ts2, wp_next_scheduled( $hook, $args ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -381,7 +381,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $hook = __FUNCTION__;

</span><span class="cx" style="display: block; padding: 0 10px">                $ts1  = strtotime( '+30 minutes' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Add an event

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Add an event.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( wp_schedule_event( $ts1, 'hourly', $hook ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = _get_cron_array();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -405,7 +405,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $hook = __FUNCTION__;

</span><span class="cx" style="display: block; padding: 0 10px">                $ts1  = strtotime( '+30 minutes' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Add an event

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Add an event.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( wp_schedule_event( $ts1, 'hourly', $hook ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = _get_cron_array();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -429,7 +429,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $hook = __FUNCTION__;

</span><span class="cx" style="display: block; padding: 0 10px">                $ts1  = strtotime( '+30 minutes' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Add an event

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Add an event.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( wp_schedule_event( $ts1, 'hourly', $hook ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = _get_cron_array();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -583,7 +583,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $ts   = strtotime( '+3 minutes' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // No scheduled events.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // - With timestamp

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // - With timestamp.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( wp_get_scheduled_event( $hook, $args, $ts ) );

</span><span class="cx" style="display: block; padding: 0 10px">                // - Get next, none scheduled.

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( wp_get_scheduled_event( $hook, $args ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -590,9 +590,9 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Schedule an event.

</span><span class="cx" style="display: block; padding: 0 10px">                wp_schedule_event( $ts, $hook, $args );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // - unregistered timestamp

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // - Unregistered timestamp.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( wp_get_scheduled_event( $hook, $args, strtotime( '+30 minutes' ) ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // - invalid timestamp.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // - Invalid timestamp.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( wp_get_scheduled_event( $hook, $args, 'Words Fail!' ) );

</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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/customize/manager.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -204,7 +204,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_customize = new WP_Customize_Manager(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

<span class="cx" style="display: block; padding: 0 10px">                                'changeset_uuid' => false, // Cause UUID to be deferred.

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                'branching'      => true, // To cause no drafted changeset to be autoloaded.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         'branching'      => true,  // To cause no drafted changeset to be autoloaded.

</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->assertNotContains( $wp_customize->changeset_uuid(), array( $uuid1, $uuid2 ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3451,12 +3451,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $video_url = 'https://www.youtube.com/watch?v=KiS8rZBeIO0';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $whitespaces = array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        ' ',  // space

-                       "\t", // horizontal tab

-                       "\n", // line feed

-                       "\r", // carriage return,

-                       "\f", // form feed,

-                       "\v", // vertical tab

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 ' ',  // Space.

+                       "\t", // Horizontal tab.

+                       "\n", // Line feed.

+                       "\r", // Carriage return.

+                       "\f", // Form feed.

+                       "\v", // Vertical tab.

</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 ( $whitespaces as $whitespace ) {

</span></span></pre></div>

<a id="trunktestsphpunittestscustomizesettingphp"></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/setting.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/setting.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/customize/setting.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -386,7 +386,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $setting->preview() );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 1, did_action( "customize_preview_{$setting->id}" ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 1, did_action( "customize_preview_{$setting->type}" ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $this->undefined, $this->custom_type_getter( $name, $this->undefined ) ); // Note: for a non-custom type this is $default

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertEquals( $this->undefined, $this->custom_type_getter( $name, $this->undefined ) ); // Note: for a non-custom type this is $default.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $default, $setting->value() ); // Should be same as above.

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Custom type existing and no post value override.

</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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/customize/widgets.php     2020-01-29 00:43:23 UTC (rev 47122)

</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">                $GLOBALS['wp_customize'] = new WP_Customize_Manager();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->manager           = $GLOBALS['wp_customize'];

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                unset( $GLOBALS['_wp_sidebars_widgets'] ); // clear out cache set by wp_get_sidebars_widgets()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         unset( $GLOBALS['_wp_sidebars_widgets'] ); // Clear out cache set by wp_get_sidebars_widgets().

</ins><span class="cx" style="display: block; padding: 0 10px">                 $sidebars_widgets = wp_get_sidebars_widgets();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEqualSets( array( 'wp_inactive_widgets', 'sidebar-1', 'sidebar-2' ), array_keys( wp_get_sidebars_widgets() ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertContains( 'search-2', $sidebars_widgets['sidebar-1'] );

</span></span></pre></div>

<a id="trunktestsphpunittestsdatequeryphp"></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/date/query.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/date/query.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/date/query.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -321,19 +321,19 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_build_value_compare_in() {

</span><span class="cx" style="display: block; padding: 0 10px">                $q = new WP_Date_Query( array() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Single integer

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Single integer.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $found = $q->build_value( 'IN', 4 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( '(4)', $found );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Single non-integer

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Single non-integer.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $found = $q->build_value( 'IN', 'foo' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $found );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Array of integers

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Array of integers.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $found = $q->build_value( 'IN', array( 1, 4, 7 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( '(1,4,7)', $found );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Array containing non-integers

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Array containing non-integers.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $found = $q->build_value( 'IN', array( 1, 'foo', 7 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( '(1,7)', $found );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -344,19 +344,19 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_build_value_compare_not_in() {

</span><span class="cx" style="display: block; padding: 0 10px">                $q = new WP_Date_Query( array() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Single integer

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Single integer.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $found = $q->build_value( 'NOT IN', 4 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( '(4)', $found );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Single non-integer

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Single non-integer.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $found = $q->build_value( 'NOT IN', 'foo' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $found );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Array of integers

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Array of integers.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $found = $q->build_value( 'NOT IN', array( 1, 4, 7 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( '(1,4,7)', $found );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Array containing non-integers

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Array containing non-integers.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $found = $q->build_value( 'NOT IN', array( 1, 'foo', 7 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( '(1,7)', $found );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -503,7 +503,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_build_mysql_datetime_datetime_non_array() {

</span><span class="cx" style="display: block; padding: 0 10px">                $q = new WP_Date_Query( array() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // This might be a fragile test if it takes longer than 1 second to run

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // This might be a fragile test if it takes longer than 1 second to run.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $found    = $q->build_mysql_datetime( 'foo' );

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = gmdate( 'Y-m-d H:i:s', false );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( $expected, $found );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -607,15 +607,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_build_time_query_compare_in() {

</span><span class="cx" style="display: block; padding: 0 10px">                $q = new WP_Date_Query( array() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Just hour

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Just hour.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $found = $q->build_time_query( 'post_date', 'IN', array( 1, 2 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( 'HOUR( post_date ) IN (1,2)', $found );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Skip minute

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Skip minute.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $found = $q->build_time_query( 'post_date', 'IN', array( 1, 2 ), null, 6 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( 'HOUR( post_date ) IN (1,2) AND SECOND( post_date ) IN (6)', $found );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // All three

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // All three.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $found = $q->build_time_query( 'post_date', 'IN', array( 1, 2 ), array( 3, 4, 5 ), 6 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( 'HOUR( post_date ) IN (1,2) AND MINUTE( post_date ) IN (3,4,5) AND SECOND( post_date ) IN (6)', $found );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -623,15 +623,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_build_time_query_compare_not_in() {

</span><span class="cx" style="display: block; padding: 0 10px">                $q = new WP_Date_Query( array() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Just hour

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Just hour.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $found = $q->build_time_query( 'post_date', 'NOT IN', array( 1, 2 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( 'HOUR( post_date ) NOT IN (1,2)', $found );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Skip minute

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Skip minute.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $found = $q->build_time_query( 'post_date', 'NOT IN', array( 1, 2 ), null, 6 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( 'HOUR( post_date ) NOT IN (1,2) AND SECOND( post_date ) NOT IN (6)', $found );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // All three

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // All three.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $found = $q->build_time_query( 'post_date', 'NOT IN', array( 1, 2 ), array( 3, 4, 5 ), 6 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( 'HOUR( post_date ) NOT IN (1,2) AND MINUTE( post_date ) NOT IN (3,4,5) AND SECOND( post_date ) NOT IN (6)', $found );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -639,15 +639,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_build_time_query_compare_between() {

</span><span class="cx" style="display: block; padding: 0 10px">                $q = new WP_Date_Query( array() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Just hour

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Just hour.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $found = $q->build_time_query( 'post_date', 'BETWEEN', array( 1, 2 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( 'HOUR( post_date ) BETWEEN 1 AND 2', $found );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Skip minute

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Skip minute.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $found = $q->build_time_query( 'post_date', 'BETWEEN', array( 1, 2 ), null, array( 6, 7 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( 'HOUR( post_date ) BETWEEN 1 AND 2 AND SECOND( post_date ) BETWEEN 6 AND 7', $found );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // All three

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // All three.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $found = $q->build_time_query( 'post_date', 'BETWEEN', array( 1, 2 ), array( 3, 4 ), array( 6, 7 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( 'HOUR( post_date ) BETWEEN 1 AND 2 AND MINUTE( post_date ) BETWEEN 3 AND 4 AND SECOND( post_date ) BETWEEN 6 AND 7', $found );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -655,15 +655,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_build_time_query_compare_not_between() {

</span><span class="cx" style="display: block; padding: 0 10px">                $q = new WP_Date_Query( array() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Just hour

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Just hour.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $found = $q->build_time_query( 'post_date', 'NOT BETWEEN', array( 1, 2 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( 'HOUR( post_date ) NOT BETWEEN 1 AND 2', $found );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Skip minute

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Skip minute.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $found = $q->build_time_query( 'post_date', 'NOT BETWEEN', array( 1, 2 ), null, array( 6, 7 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( 'HOUR( post_date ) NOT BETWEEN 1 AND 2 AND SECOND( post_date ) NOT BETWEEN 6 AND 7', $found );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // All three

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // All three.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $found = $q->build_time_query( 'post_date', 'NOT BETWEEN', array( 1, 2 ), array( 3, 4 ), array( 6, 7 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( 'HOUR( post_date ) NOT BETWEEN 1 AND 2 AND MINUTE( post_date ) NOT BETWEEN 3 AND 4 AND SECOND( post_date ) NOT BETWEEN 6 AND 7', $found );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -703,7 +703,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $found = $q->build_time_query( 'post_date', '=', 5, 15 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                // $compare value is floating point - use regex to account for

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // varying precision on different PHP installations

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // varying precision on different PHP installations.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertRegExp( "/DATE_FORMAT\( post_date, '%H\.%i' \) = 5\.150*/", $wpdb->remove_placeholder_escape( $found ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -714,7 +714,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $found = $q->build_time_query( 'post_date', '=', 5, 15, 35 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                // $compare value is floating point - use regex to account for

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // varying precision on different PHP installations

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // varying precision on different PHP installations.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertRegExp( "/DATE_FORMAT\( post_date, '%H\.%i%s' \) = 5\.15350*/", $wpdb->remove_placeholder_escape( $found ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -725,7 +725,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $found = $q->build_time_query( 'post_date', '=', null, 15, 35 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                // $compare value is floating point - use regex to account for

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // varying precision on different PHP installations

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // varying precision on different PHP installations.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertRegExp( "/DATE_FORMAT\( post_date, '0\.%i%s' \) = 0\.15350*/", $wpdb->remove_placeholder_escape( $found ) );

</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="trunktestsphpunittestsdbcharsetphp"></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/db/charset.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/db/charset.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/db/charset.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,7 +72,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                ),

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                        'ascii'                                 => array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // ascii gets special treatment, make sure it's covered

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // ascii gets special treatment, make sure it's covered.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'charset'  => 'ascii',

</span><span class="cx" style="display: block; padding: 0 10px">                                'value'    => 'Hello World',

</span><span class="cx" style="display: block; padding: 0 10px">                                'expected' => 'Hello World',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,7 +82,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                ),

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                        'ascii_char_length'                     => array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // ascii gets special treatment, make sure it's covered

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // ascii gets special treatment, make sure it's covered.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'charset'  => 'ascii',

</span><span class="cx" style="display: block; padding: 0 10px">                                'value'    => str_repeat( 'A', 11 ),

</span><span class="cx" style="display: block; padding: 0 10px">                                'expected' => str_repeat( 'A', 10 ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -92,7 +92,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">                        'ascii_byte_length'                     => array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // ascii gets special treatment, make sure it's covered

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // ascii gets special treatment, make sure it's covered.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'charset'  => 'ascii',

</span><span class="cx" style="display: block; padding: 0 10px">                                'value'    => str_repeat( 'A', 11 ),

</span><span class="cx" style="display: block; padding: 0 10px">                                'expected' => str_repeat( 'A', 10 ),

</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">                                ),

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                        'utf8'                                  => array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // utf8 only allows <= 3-byte chars

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // utf8 only allows <= 3-byte chars.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'charset'  => 'utf8',

</span><span class="cx" style="display: block; padding: 0 10px">                                'value'    => "H€llo\xf0\x9f\x98\x88World¢",

</span><span class="cx" style="display: block; padding: 0 10px">                                'expected' => 'H€lloWorld¢',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -112,7 +112,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                ),

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                        'utf8_23char_length'                    => array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // utf8 only allows <= 3-byte chars

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // utf8 only allows <= 3-byte chars.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'charset'  => 'utf8',

</span><span class="cx" style="display: block; padding: 0 10px">                                'value'    => str_repeat( '²３', 10 ),

</span><span class="cx" style="display: block; padding: 0 10px">                                'expected' => str_repeat( '²３', 5 ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -122,7 +122,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                ),

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                        'utf8_23byte_length'                    => array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // utf8 only allows <= 3-byte chars

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // utf8 only allows <= 3-byte chars.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'charset'  => 'utf8',

</span><span class="cx" style="display: block; padding: 0 10px">                                'value'    => str_repeat( '²３', 10 ),

</span><span class="cx" style="display: block; padding: 0 10px">                                'expected' => '²３²３',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -132,7 +132,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                ),

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                        'utf8_3char_length'                     => array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // utf8 only allows <= 3-byte chars

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // utf8 only allows <= 3-byte chars.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'charset'  => 'utf8',

</span><span class="cx" style="display: block; padding: 0 10px">                                'value'    => str_repeat( '３', 11 ),

</span><span class="cx" style="display: block; padding: 0 10px">                                'expected' => str_repeat( '３', 10 ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -142,7 +142,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                ),

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                        'utf8_3byte_length'                     => array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // utf8 only allows <= 3-byte chars

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // utf8 only allows <= 3-byte chars.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'charset'  => 'utf8',

</span><span class="cx" style="display: block; padding: 0 10px">                                'value'    => str_repeat( '３', 11 ),

</span><span class="cx" style="display: block; padding: 0 10px">                                'expected' => '３３３',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -152,7 +152,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                ),

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                        'utf8mb3'                               => array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // utf8mb3 should behave the same an utf8

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // utf8mb3 should behave the same an utf8.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'charset'  => 'utf8mb3',

</span><span class="cx" style="display: block; padding: 0 10px">                                'value'    => "H€llo\xf0\x9f\x98\x88World¢",

</span><span class="cx" style="display: block; padding: 0 10px">                                'expected' => 'H€lloWorld¢',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -162,7 +162,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                ),

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                        'utf8mb3_23char_length'                 => array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // utf8mb3 should behave the same an utf8

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // utf8mb3 should behave the same an utf8.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'charset'  => 'utf8mb3',

</span><span class="cx" style="display: block; padding: 0 10px">                                'value'    => str_repeat( '²３', 10 ),

</span><span class="cx" style="display: block; padding: 0 10px">                                'expected' => str_repeat( '²３', 5 ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -172,7 +172,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                ),

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                        'utf8mb3_23byte_length'                 => array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // utf8mb3 should behave the same an utf8

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // utf8mb3 should behave the same an utf8.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'charset'  => 'utf8mb3',

</span><span class="cx" style="display: block; padding: 0 10px">                                'value'    => str_repeat( '²３', 10 ),

</span><span class="cx" style="display: block; padding: 0 10px">                                'expected' => '²３²３',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -182,7 +182,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                ),

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                        'utf8mb3_3char_length'                  => array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // utf8mb3 should behave the same an utf8

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // utf8mb3 should behave the same an utf8.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'charset'  => 'utf8mb3',

</span><span class="cx" style="display: block; padding: 0 10px">                                'value'    => str_repeat( '３', 11 ),

</span><span class="cx" style="display: block; padding: 0 10px">                                'expected' => str_repeat( '３', 10 ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -192,7 +192,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                ),

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                        'utf8mb3_3byte_length'                  => array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // utf8mb3 should behave the same an utf8

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // utf8mb3 should behave the same an utf8.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'charset'  => 'utf8mb3',

</span><span class="cx" style="display: block; padding: 0 10px">                                'value'    => str_repeat( '３', 10 ),

</span><span class="cx" style="display: block; padding: 0 10px">                                'expected' => '３３３',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -202,7 +202,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                ),

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                        'utf8mb4'                               => array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // utf8mb4 allows 4-byte characters, too

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // utf8mb4 allows 4-byte characters, too.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'charset'  => 'utf8mb4',

</span><span class="cx" style="display: block; padding: 0 10px">                                'value'    => "H€llo\xf0\x9f\x98\x88World¢",

</span><span class="cx" style="display: block; padding: 0 10px">                                'expected' => "H€llo\xf0\x9f\x98\x88World¢",

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -212,7 +212,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                ),

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                        'utf8mb4_234char_length'                => array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // utf8mb4 allows 4-byte characters, too

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // utf8mb4 allows 4-byte characters, too.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'charset'  => 'utf8mb4',

</span><span class="cx" style="display: block; padding: 0 10px">                                'value'    => str_repeat( '²３𝟜', 10 ),

</span><span class="cx" style="display: block; padding: 0 10px">                                'expected' => '²３𝟜²３𝟜²３𝟜²',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -222,7 +222,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">                        'utf8mb4_234byte_length'                => array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // utf8mb4 allows 4-byte characters, too

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // utf8mb4 allows 4-byte characters, too.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'charset'  => 'utf8mb4',

</span><span class="cx" style="display: block; padding: 0 10px">                                'value'    => str_repeat( '²３𝟜', 10 ),

</span><span class="cx" style="display: block; padding: 0 10px">                                'expected' => '²３𝟜',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -232,7 +232,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">                        'utf8mb4_4char_length'                  => array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // utf8mb4 allows 4-byte characters, too

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // utf8mb4 allows 4-byte characters, too.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'charset'  => 'utf8mb4',

</span><span class="cx" style="display: block; padding: 0 10px">                                'value'    => str_repeat( '𝟜', 11 ),

</span><span class="cx" style="display: block; padding: 0 10px">                                'expected' => str_repeat( '𝟜', 10 ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -242,7 +242,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                ),

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                        'utf8mb4_4byte_length'                  => array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // utf8mb4 allows 4-byte characters, too

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // utf8mb4 allows 4-byte characters, too.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'charset'  => 'utf8mb4',

</span><span class="cx" style="display: block; padding: 0 10px">                                'value'    => str_repeat( '𝟜', 10 ),

</span><span class="cx" style="display: block; padding: 0 10px">                                'expected' => '𝟜𝟜',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -326,8 +326,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'expected' => 'WordPress',

</span><span class="cx" style="display: block; padding: 0 10px">                                'length'   => false,

</span><span class="cx" style="display: block; padding: 0 10px">                                // Don't set 'ascii' => true/false.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // That's a different codepath than it being unset even if

-                               // three's only only ASCII in the value.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // That's a different codepath than it being unset

+                               // even if there's only ASCII in the value.

</ins><span class="cx" style="display: block; padding: 0 10px">                         ),

</span><span class="cx" style="display: block; padding: 0 10px">                        'cp1251_char_length'                    => array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'charset'  => 'cp1251',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -405,7 +405,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">                        'false'                                 => array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // false is a column with no character set (ie, a number column)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // False is a column with no character set (i.e. a number column).

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'charset'  => false,

</span><span class="cx" style="display: block; padding: 0 10px">                                'value'    => 100,

</span><span class="cx" style="display: block; padding: 0 10px">                                'expected' => 100,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -414,11 +414,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( function_exists( 'mb_convert_encoding' ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // big5 is a non-Unicode multibyte charset

-                       $utf8      = "a\xe5\x85\xb1b"; // UTF-8 Character 20849

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // big5 is a non-Unicode multibyte charset.

+                       $utf8      = "a\xe5\x85\xb1b"; // UTF-8 Character 20849.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $big5      = mb_convert_encoding( $utf8, 'BIG-5', 'UTF-8' );

</span><span class="cx" style="display: block; padding: 0 10px">                        $conv_utf8 = mb_convert_encoding( $big5, 'UTF-8', 'BIG-5' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Make sure PHP's multibyte conversions are working correctly

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Make sure PHP's multibyte conversions are working correctly.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertNotEquals( $utf8, $big5 );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $utf8, $conv_utf8 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -535,7 +535,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $charset = $GLOBALS['wpdb']->get_col_charset( $GLOBALS['wpdb']->posts, 'post_content' );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // 'value' and 'format' are $data, 'charset' ends up as part of $expected

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // 'value' and 'format' are $data, 'charset' ends up as part of $expected.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $no_string_fields = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'post_parent'   => array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -563,7 +563,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 is the same data used in process_field_charsets_for_nonexistent_table()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // This is the same data used in process_field_charsets_for_nonexistent_table().

</ins><span class="cx" style="display: block; padding: 0 10px">                 $non_ascii_string_fields = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'post_content' => array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'value'   => '¡foo foo foo!',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -647,7 +647,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->markTestSkipped( 'This test requires a utf8 character set' );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Invalid 3-byte and 4-byte sequences

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Invalid 3-byte and 4-byte sequences.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $value    = "H€llo\xe0\x80\x80World\xf0\xff\xff\xff¢";

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = 'H€lloWorld¢';

</span><span class="cx" style="display: block; padding: 0 10px">                $actual   = $wpdb->strip_invalid_text_for_column( $wpdb->posts, 'post_content', $value );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -864,13 +864,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $table_name = 'strip_invalid_text_from_query_table';

</span><span class="cx" style="display: block; padding: 0 10px">                $data       = array(

</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">-                                // binary tables don't get stripped

-                               '( a VARCHAR(50) CHARACTER SET utf8, b BINARY )', // create

-                               "('foo\xf0\x9f\x98\x88bar', 'foo')",              // query

-                               "('foo\xf0\x9f\x98\x88bar', 'foo')",               // expected result

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Binary tables don't get stripped.

+                               '( a VARCHAR(50) CHARACTER SET utf8, b BINARY )', // Create.

+                               "('foo\xf0\x9f\x98\x88bar', 'foo')",              // Query.

+                               "('foo\xf0\x9f\x98\x88bar', 'foo')",              // Expected result.

</ins><span class="cx" style="display: block; padding: 0 10px">                         ),

</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">-                                // utf8/utf8mb4 tables default to utf8

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // utf8/utf8mb4 tables default to utf8.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '( a VARCHAR(50) CHARACTER SET utf8, b VARCHAR(50) CHARACTER SET utf8mb4 )',

</span><span class="cx" style="display: block; padding: 0 10px">                                "('foo\xf0\x9f\x98\x88bar', 'foo')",

</span><span class="cx" style="display: block; padding: 0 10px">                                "('foobar', 'foo')",

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -964,8 +964,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $data       = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

<span class="cx" style="display: block; padding: 0 10px">                                // utf8_bin tables don't need extra sanity checking.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                '( a VARCHAR(50) COLLATE utf8_bin )', // create

-                               true,                                  // expected result

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         '( a VARCHAR(50) COLLATE utf8_bin )', // Create.

+                               true,                                 // Expected result.

</ins><span class="cx" style="display: block; padding: 0 10px">                         ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

<span class="cx" style="display: block; padding: 0 10px">                                // Neither do utf8_general_ci tables.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1034,11 +1034,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_strip_invalid_text_for_column_bails_if_ascii_input_too_long() {

</span><span class="cx" style="display: block; padding: 0 10px">                global $wpdb;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // TEXT column

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // TEXT column.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $stripped = $wpdb->strip_invalid_text_for_column( $wpdb->comments, 'comment_content', str_repeat( 'A', 65536 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 65535, strlen( $stripped ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // VARCHAR column

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // VARCHAR column.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $stripped = $wpdb->strip_invalid_text_for_column( $wpdb->comments, 'comment_agent', str_repeat( 'A', 256 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 255, strlen( $stripped ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span></span></pre></div>

<a id="trunktestsphpunittestsdbphp"></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/db.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/db.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/db.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -86,16 +86,16 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_locale_floats() {

</span><span class="cx" style="display: block; padding: 0 10px">                global $wpdb;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Save the current locale settings

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Save the current locale settings.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $current_locales = explode( ';', setlocale( LC_ALL, 0 ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Switch to Russian

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Switch to Russian.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $flag = setlocale( LC_ALL, 'ru_RU.utf8', 'rus', 'fr_FR.utf8', 'fr_FR', 'de_DE.utf8', 'de_DE', 'es_ES.utf8', 'es_ES', 'ja_JP.utf8', 'ja_JP' );

</span><span class="cx" style="display: block; padding: 0 10px">                if ( false === $flag ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->markTestSkipped( 'No European languages available for testing' );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Try an update query

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Try an update query.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $wpdb->suppress_errors( true );

</span><span class="cx" style="display: block; padding: 0 10px">                $wpdb->update(

</span><span class="cx" style="display: block; padding: 0 10px">                        'test_table',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,14 +106,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $wpdb->suppress_errors( 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">-                // Ensure the float isn't 0,700

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Ensure the float isn't 0,700.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertContains( '0.700', array_pop( $this->_queries ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Try a prepare

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Try a prepare.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $sql = $wpdb->prepare( 'UPDATE test_table SET float_column = %f AND meta_id = %d', 0.7, 5 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertContains( '0.700', $sql );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Restore locale settings

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Restore locale settings.

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $current_locales as $locale_setting ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( false !== strpos( $locale_setting, '=' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                list( $category, $locale ) = explode( '=', $locale_setting );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -133,11 +133,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                global $wpdb;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $inputs   = array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'howdy%', //Single Percent

-                       'howdy_', //Single Underscore

-                       'howdy\\', //Single slash

-                       'howdy\\howdy%howdy_', //The works

-                       'howdy\'"[[]*#[^howdy]!+)(*&$#@!~|}{=--`/.,<>?', //Plain text

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'howdy%',              // Single percent.

+                       'howdy_',              // Single underscore.

+                       'howdy\\',             // Single slash.

+                       'howdy\\howdy%howdy_', // The works.

+                       'howdy\'"[[]*#[^howdy]!+)(*&$#@!~|}{=--`/.,<>?', // Plain text.

</ins><span class="cx" style="display: block; padding: 0 10px">                 );

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'howdy\\%',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -194,7 +194,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'a\\%aa', // SELECT 'a\\%aa'

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                'a\\%aa', // LIKE 'a\\\\\\%aa' # The PHP literal would be "LIKE 'a\\\\\\\\\\\\%aa'".  This is why we need reliable escape functions!

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         'a\\%aa', // LIKE 'a\\\\\\%aa' # The PHP literal would be "LIKE 'a\\\\\\\\\\\\%aa'". This is why we need reliable escape functions!

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '1',

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -234,7 +234,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEmpty( $wpdb->dbh );

</span><span class="cx" style="display: block; padding: 0 10px">                $dbh = $wpdb->dbh;

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEmpty( $dbh );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertTrue( isset( $wpdb->dbh ) ); // Test __isset()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertTrue( isset( $wpdb->dbh ) ); // Test __isset().

</ins><span class="cx" style="display: block; padding: 0 10px">                 unset( $wpdb->dbh );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( empty( $wpdb->dbh ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $wpdb->dbh = $dbh;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -432,9 +432,9 @@

</span><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">                        array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                "SELECT * FROM $wpdb->users WHERE id = %d AND user_login = %s",     // Query

-                               array( 1, 'admin', 'extra-arg' ),                                   // ::prepare() args, to be passed via call_user_func_array

-                               "SELECT * FROM $wpdb->users WHERE id = 1 AND user_login = 'admin'", // Expected output

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "SELECT * FROM $wpdb->users WHERE id = %d AND user_login = %s",     // Query.

+                               array( 1, 'admin', 'extra-arg' ),                                   // ::prepare() args, to be passed via call_user_func_array().

+                               "SELECT * FROM $wpdb->users WHERE id = 1 AND user_login = 'admin'", // Expected output.

</ins><span class="cx" style="display: block; padding: 0 10px">                         ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                "SELECT * FROM $wpdb->users WHERE id = %%%d AND user_login = %s",

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -748,6 +748,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">         * @ticket 21212

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * @ticket 32763

</ins><span class="cx" style="display: block; padding: 0 10px">          */

</span><span class="cx" style="display: block; padding: 0 10px">        function data_get_table_from_query() {

</span><span class="cx" style="display: block; padding: 0 10px">                $table       = 'a_test_table_name';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -758,7 +759,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">                $queries = array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Basic

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Basic.

</ins><span class="cx" style="display: block; padding: 0 10px">                         "SELECT * FROM $table",

</span><span class="cx" style="display: block; padding: 0 10px">                        "SELECT * FROM `$table`",

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -795,7 +796,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        "DELETE a FROM $table a",

</span><span class="cx" style="display: block; padding: 0 10px">                        "DELETE `a` FROM $table a",

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Extended

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Extended.

</ins><span class="cx" style="display: block; padding: 0 10px">                         "EXPLAIN SELECT * FROM $table",

</span><span class="cx" style="display: block; padding: 0 10px">                        "EXPLAIN EXTENDED SELECT * FROM $table",

</span><span class="cx" style="display: block; padding: 0 10px">                        "EXPLAIN EXTENDED SELECT * FROM `$table`",

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -897,13 +898,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function data_get_escaped_table_from_show_query() {

</span><span class="cx" style="display: block; padding: 0 10px">                return array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Equality

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Equality.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( "SHOW TABLE STATUS WHERE Name = 'test_name'", 'test_name' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( 'SHOW TABLE STATUS WHERE NAME="test_name"', 'test_name' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( 'SHOW TABLES WHERE Name = "test_name"', 'test_name' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( "SHOW FULL TABLES WHERE Name='test_name'", 'test_name' ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // LIKE

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // LIKE.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( "SHOW TABLE STATUS LIKE 'test\_prefix\_%'", 'test_prefix_' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( 'SHOW TABLE STATUS LIKE "test\_prefix\_%"', 'test_prefix_' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( "SHOW TABLES LIKE 'test\_prefix\_%'", 'test_prefix_' ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -946,7 +947,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_content' => 'foo',

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_parent'  => 0,

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        array( '%d', '%s' ), // These override core field_types

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 array( '%d', '%s' ), // These override core field_types.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_content' => array(

</span><span class="cx" style="display: block; padding: 0 10px">                                        'value'  => 'foo',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1001,7 +1002,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'this_is_not_either'       => 's',

</span><span class="cx" style="display: block; padding: 0 10px">                                'nor_this'                 => 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">-                        array( '%d', '%s' ), // The first format is used for the third

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 array( '%d', '%s' ), // The first format is used for the third.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'this_is_not_a_core_field' => array(

</span><span class="cx" style="display: block; padding: 0 10px">                                        'value'  => 0,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1019,7 +1020,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">                $vars = get_defined_vars();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Push the variable name onto the end for assertSame $message

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Push the variable name onto the end for assertSame() $message.

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $vars as $var_name => $var ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $vars[ $var_name ][] = $var_name;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1392,10 +1393,10 @@

</span><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">                        array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                '%5s',   // SQL to prepare

-                               'foo',   // Value to insert in the SQL

-                               false,   // Whether to expect an incorrect usage error or not

-                               '  foo', // Expected output

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         '%5s',   // SQL to prepare.

+                               'foo',   // Value to insert in the SQL.

+                               false,   // Whether to expect an incorrect usage error or not.

+                               '  foo', // Expected output.

</ins><span class="cx" style="display: block; padding: 0 10px">                         ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                '%1$d %%% % %%1$d%% %%%1$d%%',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1586,11 +1587,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                global $wpdb;

</span><span class="cx" style="display: block; padding: 0 10px">                return array(

</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">-                                '%s',                                  // String to pass through esc_url()

-                               ' {ESCAPE} ',                          // Query to insert the output of esc_url() into, replacing "{ESCAPE}"

-                               'foo',                                 // Data to send to prepare()

-                               true,                                  // Whether to expect an incorrect usage error or not

-                               " {$wpdb->placeholder_escape()}s ",    // Expected output

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         '%s',                                  // String to pass through esc_url().

+                               ' {ESCAPE} ',                          // Query to insert the output of esc_url() into, replacing "{ESCAPE}".

+                               'foo',                                 // Data to send to prepare().

+                               true,                                  // Whether to expect an incorrect usage error or not.

+                               " {$wpdb->placeholder_escape()}s ",    // Expected output.

</ins><span class="cx" style="display: block; padding: 0 10px">                         ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'foo%sbar',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1704,12 +1705,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function parse_db_host_data_provider() {

</span><span class="cx" style="display: block; padding: 0 10px">                return array(

</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">-                                '',    // DB_HOST

-                               false, // Expect parse_db_host to bail for this hostname

-                               '',    // Parsed host

-                               null,  // Parsed port

-                               null,  // Parsed socket

-                               false, // is_ipv6

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         '',    // DB_HOST.

+                               false, // Expect parse_db_host to bail for this hostname.

+                               '',    // Parsed host.

+                               null,  // Parsed port.

+                               null,  // Parsed socket.

+                               false, // $is_ipv6.

</ins><span class="cx" style="display: block; padding: 0 10px">                         ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                ':3306',

</span></span></pre></div>

<a id="trunktestsphpunittestsdbdeltaphp"></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/dbdelta.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/dbdelta.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/dbdelta.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -195,7 +195,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                global $wpdb;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // No column column_1

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // No column column_1.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $updates = dbDelta(

</span><span class="cx" style="display: block; padding: 0 10px">                        "

</span><span class="cx" style="display: block; padding: 0 10px">                        CREATE TABLE {$wpdb->prefix}dbdelta_test (

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -219,7 +219,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                global $wpdb;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Added column extra_col

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Added column extra_col.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $updates = dbDelta(

</span><span class="cx" style="display: block; padding: 0 10px">                        "

</span><span class="cx" style="display: block; padding: 0 10px">                        CREATE TABLE {$wpdb->prefix}dbdelta_test (

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -381,7 +381,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->markTestSkipped( 'This test requires utf8mb4 support in MySQL.' );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</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 table needs to be actually created

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // This table needs to be actually created.

</ins><span class="cx" style="display: block; padding: 0 10px">                 remove_filter( 'query', array( $this, '_create_temporary_tables' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                remove_filter( 'query', array( $this, '_drop_temporary_tables' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunktestsphpunittestsdependenciesscriptsphp"></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/dependencies/scripts.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/dependencies/scripts.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/dependencies/scripts.php  2020-01-29 00:43:23 UTC (rev 47122)

</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">                $this->assertEquals( $expected, get_echo( 'wp_print_scripts' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // No scripts left to print

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // No scripts left to print.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( '', get_echo( 'wp_print_scripts' ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,7 +81,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 16560

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_protocols() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Init

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Init.

</ins><span class="cx" style="display: block; padding: 0 10px">                 global $wp_scripts;

</span><span class="cx" style="display: block; padding: 0 10px">                $base_url_backup      = $wp_scripts->base_url;

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_scripts->base_url = 'http://example.com/wordpress';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -88,24 +88,24 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $expected             = '';

</span><span class="cx" style="display: block; padding: 0 10px">                $ver                  = get_bloginfo( '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">-                // Try with an HTTP reference

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Try with an HTTP reference.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_enqueue_script( 'jquery-http', 'http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js' );

</span><span class="cx" style="display: block; padding: 0 10px">                $expected .= "<script type='text/javascript' src='http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js?ver=$ver'></script>\n";

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Try with an HTTPS reference

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Try with an HTTPS reference.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_enqueue_script( 'jquery-https', 'https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js' );

</span><span class="cx" style="display: block; padding: 0 10px">                $expected .= "<script type='text/javascript' src='https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js?ver=$ver'></script>\n";

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Try with an automatic protocol reference (//)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Try with an automatic protocol reference (//).

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_enqueue_script( 'jquery-doubleslash', '//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js' );

</span><span class="cx" style="display: block; padding: 0 10px">                $expected .= "<script type='text/javascript' src='//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js?ver=$ver'></script>\n";

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Try with a local resource and an automatic protocol reference (//)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Try with a local resource and an automatic protocol reference (//).

</ins><span class="cx" style="display: block; padding: 0 10px">                 $url = '//my_plugin/script.js';

</span><span class="cx" style="display: block; padding: 0 10px">                wp_enqueue_script( 'plugin-script', $url );

</span><span class="cx" style="display: block; padding: 0 10px">                $expected .= "<script type='text/javascript' src='$url?ver=$ver'></script>\n";

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Try with a bad protocol

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Try with a bad protocol.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_enqueue_script( 'jquery-ftp', 'ftp://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js' );

</span><span class="cx" style="display: block; padding: 0 10px">                $expected .= "<script type='text/javascript' src='{$wp_scripts->base_url}ftp://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js?ver=$ver'></script>\n";

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -112,10 +112,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                // Go!

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected, get_echo( 'wp_print_scripts' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // No scripts left to print

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // No scripts left to print.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( '', get_echo( 'wp_print_scripts' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Cleanup

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Cleanup.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $wp_scripts->base_url = $base_url_backup;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -147,7 +147,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 16024

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wp_script_add_data_with_data_key() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Enqueue & add data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Enqueue and add data.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_enqueue_script( 'test-only-data', 'example.com', array(), null );

</span><span class="cx" style="display: block; padding: 0 10px">                wp_script_add_data( 'test-only-data', 'data', 'testing' );

</span><span class="cx" style="display: block; padding: 0 10px">                $expected  = "<script type='text/javascript'>\n/* <![CDATA[ */\ntesting\n/* ]]> */\n</script>\n";

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -156,7 +156,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                // Go!

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected, get_echo( 'wp_print_scripts' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // No scripts left to print

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // No scripts left to print.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( '', get_echo( 'wp_print_scripts' ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -166,7 +166,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 16024

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wp_script_add_data_with_conditional_key() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Enqueue & add conditional comments

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Enqueue and add conditional comments.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_enqueue_script( 'test-only-conditional', 'example.com', array(), null );

</span><span class="cx" style="display: block; padding: 0 10px">                wp_script_add_data( 'test-only-conditional', 'conditional', 'gt IE 7' );

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = "<!--[if gt IE 7]>\n<script type='text/javascript' src='http://example.com'></script>\n<![endif]-->\n";

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -174,7 +174,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                // Go!

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected, get_echo( 'wp_print_scripts' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // No scripts left to print

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // No scripts left to print.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( '', get_echo( 'wp_print_scripts' ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -184,7 +184,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 16024

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wp_script_add_data_with_data_and_conditional_keys() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Enqueue & add data plus conditional comments for both

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Enqueue and add data plus conditional comments for both.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_enqueue_script( 'test-conditional-with-data', 'example.com', array(), null );

</span><span class="cx" style="display: block; padding: 0 10px">                wp_script_add_data( 'test-conditional-with-data', 'data', 'testing' );

</span><span class="cx" style="display: block; padding: 0 10px">                wp_script_add_data( 'test-conditional-with-data', 'conditional', 'lt IE 9' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -194,7 +194,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                // Go!

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected, get_echo( 'wp_print_scripts' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // No scripts left to print

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // No scripts left to print.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( '', get_echo( 'wp_print_scripts' ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -204,7 +204,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 16024

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wp_script_add_data_with_invalid_key() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Enqueue & add an invalid key

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Enqueue and add an invalid key.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_enqueue_script( 'test-invalid', 'example.com', array(), null );

</span><span class="cx" style="display: block; padding: 0 10px">                wp_script_add_data( 'test-invalid', 'invalid', 'testing' );

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = "<script type='text/javascript' src='http://example.com'></script>\n";

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -212,7 +212,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                // Go!

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected, get_echo( 'wp_print_scripts' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // No scripts left to print

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // No scripts left to print.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( '', get_echo( 'wp_print_scripts' ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -310,9 +310,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 35873

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wp_register_script_with_dependencies_in_head_and_footer() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                wp_register_script( 'parent', '/parent.js', array( 'child-head' ), null, true ); // in footer

-               wp_register_script( 'child-head', '/child-head.js', array( 'child-footer' ), null, false ); // in head

-               wp_register_script( 'child-footer', '/child-footer.js', array(), null, true ); // in footer

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         wp_register_script( 'parent', '/parent.js', array( 'child-head' ), null, true );            // In footer.

+               wp_register_script( 'child-head', '/child-head.js', array( 'child-footer' ), null, false ); // In head.

+               wp_register_script( 'child-footer', '/child-footer.js', array(), null, true );              // In footer.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                wp_enqueue_script( 'parent' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -331,9 +331,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 35956

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wp_register_script_with_dependencies_in_head_and_footer_in_reversed_order() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                wp_register_script( 'child-head', '/child-head.js', array(), null, false ); // in head

-               wp_register_script( 'child-footer', '/child-footer.js', array(), null, true ); // in footer

-               wp_register_script( 'parent', '/parent.js', array( 'child-head', 'child-footer' ), null, true ); // in footer

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         wp_register_script( 'child-head', '/child-head.js', array(), null, false );                      // In head.

+               wp_register_script( 'child-footer', '/child-footer.js', array(), null, true );                   // In footer.

+               wp_register_script( 'parent', '/parent.js', array( 'child-head', 'child-footer' ), null, true ); // In footer.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                wp_enqueue_script( 'parent' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -352,13 +352,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 35956

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wp_register_script_with_dependencies_in_head_and_footer_in_reversed_order_and_two_parent_scripts() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                wp_register_script( 'grandchild-head', '/grandchild-head.js', array(), null, false ); // in head

-               wp_register_script( 'child-head', '/child-head.js', array(), null, false ); // in head

-               wp_register_script( 'child-footer', '/child-footer.js', array( 'grandchild-head' ), null, true ); // in footer

-               wp_register_script( 'child2-head', '/child2-head.js', array(), null, false ); // in head

-               wp_register_script( 'child2-footer', '/child2-footer.js', array(), null, true ); // in footer

-               wp_register_script( 'parent-footer', '/parent-footer.js', array( 'child-head', 'child-footer', 'child2-head', 'child2-footer' ), null, true ); // in footer

-               wp_register_script( 'parent-header', '/parent-header.js', array( 'child-head' ), null, false ); // in head

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         wp_register_script( 'grandchild-head', '/grandchild-head.js', array(), null, false );             // In head.

+               wp_register_script( 'child-head', '/child-head.js', array(), null, false );                       // In head.

+               wp_register_script( 'child-footer', '/child-footer.js', array( 'grandchild-head' ), null, true ); // In footer.

+               wp_register_script( 'child2-head', '/child2-head.js', array(), null, false );                     // In head.

+               wp_register_script( 'child2-footer', '/child2-footer.js', array(), null, true );                  // In footer.

+               wp_register_script( 'parent-footer', '/parent-footer.js', array( 'child-head', 'child-footer', 'child2-head', 'child2-footer' ), null, true ); // In footer.

+               wp_register_script( 'parent-header', '/parent-header.js', array( 'child-head' ), null, false );   // In head.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                wp_enqueue_script( 'parent-footer' );

</span><span class="cx" style="display: block; padding: 0 10px">                wp_enqueue_script( 'parent-header' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -597,7 +597,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                global $wp_scripts;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_scripts->do_concat    = true;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $wp_scripts->default_dirs = array( '/wp-admin/js/', '/wp-includes/js/' ); // Default dirs as in wp-includes/script-loader.php

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $wp_scripts->default_dirs = array( '/wp-admin/js/', '/wp-includes/js/' ); // Default dirs as in wp-includes/script-loader.php.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $expected_localized  = "<!--[if gte IE 9]>\n";

</span><span class="cx" style="display: block; padding: 0 10px">                $expected_localized .= "<script type='text/javascript'>\n/* <![CDATA[ */\nvar testExample = {\"foo\":\"bar\"};\n/* ]]> */\n</script>\n";

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -782,7 +782,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                global $wp_scripts;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_scripts->do_concat    = true;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $wp_scripts->default_dirs = array( '/wp-admin/js/', '/wp-includes/js/' ); // Default dirs as in wp-includes/script-loader.php

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $wp_scripts->default_dirs = array( '/wp-admin/js/', '/wp-includes/js/' ); // Default dirs as in wp-includes/script-loader.php.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                wp_enqueue_script( 'one', '/wp-includes/js/script.js' );

</span><span class="cx" style="display: block; padding: 0 10px">                wp_enqueue_script( 'two', '/wp-includes/js/script2.js', array( 'one' ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -807,7 +807,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                global $wp_scripts;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_scripts->do_concat    = true;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $wp_scripts->default_dirs = array( '/wp-admin/js/', '/wp-includes/js/' ); // Default dirs as in wp-includes/script-loader.php

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $wp_scripts->default_dirs = array( '/wp-admin/js/', '/wp-includes/js/' ); // Default dirs as in wp-includes/script-loader.php.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                wp_enqueue_script( 'one', '/wp-includes/js/script.js' );

</span><span class="cx" style="display: block; padding: 0 10px">                wp_enqueue_script( 'two', '/wp-includes/js/script2.js', array( 'one' ) );

</span></span></pre></div>

<a id="trunktestsphpunittestsdependenciesstylesphp"></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/dependencies/styles.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/dependencies/styles.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/dependencies/styles.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,7 +65,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected, get_echo( 'wp_print_styles' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // No styles left to print

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // No styles left to print.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( '', get_echo( 'wp_print_styles' ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -93,7 +93,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 16560

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_protocols() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Init

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Init.

</ins><span class="cx" style="display: block; padding: 0 10px">                 global $wp_styles;

</span><span class="cx" style="display: block; padding: 0 10px">                $base_url_backup     = $wp_styles->base_url;

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_styles->base_url = 'http://example.com/wordpress';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,24 +100,24 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $expected            = '';

</span><span class="cx" style="display: block; padding: 0 10px">                $ver                 = get_bloginfo( '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">-                // Try with an HTTP reference

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Try with an HTTP reference.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_enqueue_style( 'reset-css-http', 'http://yui.yahooapis.com/2.8.1/build/reset/reset-min.css' );

</span><span class="cx" style="display: block; padding: 0 10px">                $expected .= "<link rel='stylesheet' id='reset-css-http-css'  href='http://yui.yahooapis.com/2.8.1/build/reset/reset-min.css?ver=$ver' type='text/css' media='all' />\n";

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Try with an HTTPS reference

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Try with an HTTPS reference.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_enqueue_style( 'reset-css-https', 'http://yui.yahooapis.com/2.8.1/build/reset/reset-min.css' );

</span><span class="cx" style="display: block; padding: 0 10px">                $expected .= "<link rel='stylesheet' id='reset-css-https-css'  href='http://yui.yahooapis.com/2.8.1/build/reset/reset-min.css?ver=$ver' type='text/css' media='all' />\n";

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Try with an automatic protocol reference (//)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Try with an automatic protocol reference (//).

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_enqueue_style( 'reset-css-doubleslash', '//yui.yahooapis.com/2.8.1/build/reset/reset-min.css' );

</span><span class="cx" style="display: block; padding: 0 10px">                $expected .= "<link rel='stylesheet' id='reset-css-doubleslash-css'  href='//yui.yahooapis.com/2.8.1/build/reset/reset-min.css?ver=$ver' type='text/css' media='all' />\n";

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Try with a local resource and an automatic protocol reference (//)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Try with a local resource and an automatic protocol reference (//).

</ins><span class="cx" style="display: block; padding: 0 10px">                 $url = '//my_plugin/style.css';

</span><span class="cx" style="display: block; padding: 0 10px">                wp_enqueue_style( 'plugin-style', $url );

</span><span class="cx" style="display: block; padding: 0 10px">                $expected .= "<link rel='stylesheet' id='plugin-style-css'  href='$url?ver=$ver' type='text/css' media='all' />\n";

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Try with a bad protocol

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Try with a bad protocol.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_enqueue_style( 'reset-css-ftp', 'ftp://yui.yahooapis.com/2.8.1/build/reset/reset-min.css' );

</span><span class="cx" style="display: block; padding: 0 10px">                $expected .= "<link rel='stylesheet' id='reset-css-ftp-css'  href='{$wp_styles->base_url}ftp://yui.yahooapis.com/2.8.1/build/reset/reset-min.css?ver=$ver' type='text/css' media='all' />\n";

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,10 +124,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                // Go!

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected, get_echo( 'wp_print_styles' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // No styles left to print

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // No styles left to print.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( '', get_echo( 'wp_print_styles' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Cleanup

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Cleanup.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $wp_styles->base_url = $base_url_backup;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -150,7 +150,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                wp_enqueue_style( 'handle', 'http://example.com', array(), 1 );

</span><span class="cx" style="display: block; padding: 0 10px">                wp_add_inline_style( 'handle', $style );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // No styles left to print

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // No styles left to print.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $expected, get_echo( 'wp_print_styles' ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -165,7 +165,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                global $wp_styles;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_styles->do_concat    = true;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $wp_styles->default_dirs = array( '/wp-admin/', '/wp-includes/css/' ); // Default dirs as in wp-includes/script-loader.php

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $wp_styles->default_dirs = array( '/wp-admin/', '/wp-includes/css/' ); // Default dirs as in wp-includes/script-loader.php.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $style  = ".thing {\n";

</span><span class="cx" style="display: block; padding: 0 10px">                $style .= "\tbackground: red;\n";

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -209,7 +209,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                wp_add_inline_style( 'handle', $style1 );

</span><span class="cx" style="display: block; padding: 0 10px">                wp_add_inline_style( 'handle', $style2 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // No styles left to print

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // No styles left to print.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $expected, get_echo( 'wp_print_styles' ) );

</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="trunktestsphpunittestsdependenciesphp"></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/dependencies.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/dependencies.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/dependencies.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,7 +13,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( '_WP_Dependency', $dep->query( 'one' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( '_WP_Dependency', $dep->query( 'two' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //Cannot reuse names

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Cannot reuse names.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( $dep->add( 'one', '' ) );

</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="trunktestsphpunittestserrorprotectionrecoverymodekeyservicephp"></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/error-protection/recovery-mode-key-service.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/error-protection/recovery-mode-key-service.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/error-protection/recovery-mode-key-service.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -133,7 +133,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $service->validate_recovery_mode_key( $token, $key, HOUR_IN_SECONDS ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // data should be remove by first call

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Data should be remove by first call.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $error = $service->validate_recovery_mode_key( $token, $key, HOUR_IN_SECONDS );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertWPError( $error );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -146,7 +146,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_validate_recovery_mode_key_returns_error_if_token_used_more_than_once_more_than_key_stored() {

</span><span class="cx" style="display: block; padding: 0 10px">                $service = new WP_Recovery_Mode_Key_Service();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // create an extra key

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create an extra key.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $token = $service->generate_recovery_mode_token();

</span><span class="cx" style="display: block; padding: 0 10px">                $service->generate_and_store_recovery_mode_key( $token );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -155,7 +155,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $service->validate_recovery_mode_key( $token, $key, HOUR_IN_SECONDS ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // data should be remove by first call

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Data should be remove by first call.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $error = $service->validate_recovery_mode_key( $token, $key, HOUR_IN_SECONDS );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertWPError( $error );

</span></span></pre></div>

<a id="trunktestsphpunittestsexternalhttpbasicphp"></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/external-http/basic.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/external-http/basic.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/external-http/basic.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,7 +62,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                preg_match( '#(\d{4}-\d{2}-\d{2}), General Availability#', $response_body, $mysqlmatches );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Per https://www.mysql.com/support/, Oracle actively supports MySQL releases for 5 years from GA release

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Per https://www.mysql.com/support/, Oracle actively supports MySQL releases for 5 years from GA release.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $mysql_eol = strtotime( $mysqlmatches[1] . ' +5 years' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertLessThan( $mysql_eol, time(), "readme.html's Recommended MySQL version is too old. Remember to update the WordPress.org Requirements page, too." );

</span></span></pre></div>

<a id="trunktestsphpunittestsfeedatomphp"></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/feed/atom.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/feed/atom.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/feed/atom.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,7 +17,7 @@

<span class="cx" style="display: block; padding: 0 10px">         * Setup a new user and attribute some posts.

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public static function wpSetUpBeforeClass( $factory ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Create a user

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create a user.

</ins><span class="cx" style="display: block; padding: 0 10px">                 self::$user_id = $factory->user->create(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'role'         => 'author',

</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">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Create a taxonomy

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create a taxonomy.

</ins><span class="cx" style="display: block; padding: 0 10px">                 self::$category = self::factory()->category->create_and_get(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'name' => 'Test Category',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,7 +36,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $count = get_option( 'posts_per_rss' ) + 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">-                // Create a few posts

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create a few posts.

</ins><span class="cx" style="display: block; padding: 0 10px">                 self::$posts = $factory->post->create_many(

</span><span class="cx" style="display: block; padding: 0 10px">                        $count,

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</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">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Assign a category to those posts

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Assign a category to those posts.

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( self::$posts as $post ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        wp_set_object_terms( $post, self::$category->slug, 'category' );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -140,27 +140,27 @@

<span class="cx" style="display: block; padding: 0 10px">                // Verify we are displaying the correct number of posts.

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertCount( $this->post_count, $entries );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // We Really only need to test X number of entries unless the content is different

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // We really only need to test X number of entries unless the content is different.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $entries = array_slice( $entries, 1 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Check each of the desired entries against the known post data.

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $entries as $key => $entry ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Get post for comparison

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Get post for comparison.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $id = xml_find( $entries[ $key ]['child'], 'id' );

</span><span class="cx" style="display: block; padding: 0 10px">                        preg_match( '/\?p=(\d+)/', $id[0]['content'], $matches );

</span><span class="cx" style="display: block; padding: 0 10px">                        $post = get_post( $matches[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">-                        // Author

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Author.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $author = xml_find( $entries[ $key ]['child'], 'author', 'name' );

</span><span class="cx" style="display: block; padding: 0 10px">                        $user   = new WP_User( $post->post_author );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $user->display_name, $author[0]['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">-                        // Title

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Title.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $title = xml_find( $entries[ $key ]['child'], 'title' );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $post->post_title, $title[0]['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">-                        // Link rel="alternate"

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Link rel="alternate".

</ins><span class="cx" style="display: block; padding: 0 10px">                         $link_alts = xml_find( $entries[ $key ]['child'], 'link' );

</span><span class="cx" style="display: block; padding: 0 10px">                        foreach ( $link_alts as $link_alt ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( 'alternate' === $link_alt['attributes']['rel'] ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -168,19 +168,19 @@

</span><span class="cx" style="display: 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

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // ID.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $guid = xml_find( $entries[ $key ]['child'], 'id' );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $post->guid, $id[0]['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">-                        // Updated

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Updated.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $updated = xml_find( $entries[ $key ]['child'], 'updated' );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( strtotime( $post->post_modified_gmt ), strtotime( $updated[0]['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">-                        // Published

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Published.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $published = xml_find( $entries[ $key ]['child'], 'published' );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( strtotime( $post->post_date_gmt ), strtotime( $published[0]['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">-                        // Category

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Category.

</ins><span class="cx" style="display: block; padding: 0 10px">                         foreach ( get_the_category( $post->ID ) as $term ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $terms[] = $term->name;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -190,13 +190,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                        unset( $terms );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Content

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Content.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( ! $this->excerpt_only ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $content = xml_find( $entries[ $key ]['child'], 'content' );

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->assertEquals( trim( apply_filters( 'the_content', $post->post_content ) ), trim( $content[0]['content'] ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Link rel="replies"

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Link rel="replies".

</ins><span class="cx" style="display: block; padding: 0 10px">                         $link_replies = xml_find( $entries[ $key ]['child'], 'link' );

</span><span class="cx" style="display: block; padding: 0 10px">                        foreach ( $link_replies as $link_reply ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( 'replies' === $link_reply['attributes']['rel'] && 'application/atom+xml' === $link_reply['attributes']['type'] ) {

</span></span></pre></div>

<a id="trunktestsphpunittestsfeedrss2php"></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/feed/rss2.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/feed/rss2.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/feed/rss2.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,7 +18,7 @@

<span class="cx" style="display: block; padding: 0 10px">         * Setup a new user and attribute some posts.

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public static function wpSetUpBeforeClass( $factory ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Create a user

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create a user.

</ins><span class="cx" style="display: block; padding: 0 10px">                 self::$user_id = $factory->user->create(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'role'         => 'author',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,7 +27,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Create a taxonomy

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create a taxonomy.

</ins><span class="cx" style="display: block; padding: 0 10px">                 self::$category = $factory->category->create_and_get(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'name' => 'Foo Category',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,7 +41,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $count = get_option( 'posts_per_rss' ) + 1;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                self::$posts = array();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Create a few posts

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create a few posts.

</ins><span class="cx" style="display: block; padding: 0 10px">                 for ( $i = 1; $i <= $count; $i++ ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        self::$posts[] = $factory->post->create(

</span><span class="cx" style="display: block; padding: 0 10px">                                array(

</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">                        );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Assign a category to those posts

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Assign a category to those posts.

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( self::$posts as $post ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        wp_set_object_terms( $post, self::$category->slug, 'category' );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -68,7 +68,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->post_count   = (int) get_option( 'posts_per_rss' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->excerpt_only = get_option( 'rss_use_excerpt' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // this seems to break something

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // This seems to break something.

</ins><span class="cx" style="display: block; padding: 0 10px">                 update_option( 'use_smilies', false );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -113,7 +113,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'http://wellformedweb.org/CommentAPI/', $rss[0]['attributes']['xmlns:wfw'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'http://purl.org/dc/elements/1.1/', $rss[0]['attributes']['xmlns:dc'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // rss should have exactly one child element (channel)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // RSS should have exactly one child element (channel).

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 1, count( $rss[0]['child'] ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -127,13 +127,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $feed = $this->do_rss2();

</span><span class="cx" style="display: block; padding: 0 10px">                $xml  = xml_to_array( $feed );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // get the rss -> channel element

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Get the rss -> channel element.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $channel = xml_find( $xml, 'rss', 'channel' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // The channel should be free of attributes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // The channel should be free of attributes.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( empty( $channel[0]['attributes'] ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Verify the channel is present and contains a title child element

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Verify the channel is present and contains a title child element.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $title = xml_find( $xml, 'rss', 'channel', 'title' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( get_option( 'blogname' ), $title[0]['content'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -180,45 +180,45 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $feed = $this->do_rss2();

</span><span class="cx" style="display: block; padding: 0 10px">                $xml  = xml_to_array( $feed );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Get all the <item> child elements of the <channel> element

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Get all the <item> child elements of the <channel> element.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $items = xml_find( $xml, 'rss', 'channel', 'item' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Verify we are displaying the correct number of posts.

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertCount( $this->post_count, $items );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // We Really only need to test X number of items unless the content is different

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // We really only need to test X number of items unless the content is different.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $items = array_slice( $items, 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">-                // Check each of the desired entries against the known post data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check each of the desired entries against the known post data.

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $items as $key => $item ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Get post for comparison

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Get post for comparison.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $guid = xml_find( $items[ $key ]['child'], 'guid' );

</span><span class="cx" style="display: block; padding: 0 10px">                        preg_match( '/\?p=(\d+)/', $guid[0]['content'], $matches );

</span><span class="cx" style="display: block; padding: 0 10px">                        $post = get_post( $matches[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">-                        // Title

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Title.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $title = xml_find( $items[ $key ]['child'], 'title' );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $post->post_title, $title[0]['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">-                        // Link

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Link.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $link = xml_find( $items[ $key ]['child'], 'link' );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( get_permalink( $post ), $link[0]['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">-                        // Comment link

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Comment link.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $comments_link = xml_find( $items[ $key ]['child'], 'comments' );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( get_permalink( $post ) . '#respond', $comments_link[0]['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">-                        // Pub date

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Pub date.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $pubdate = xml_find( $items[ $key ]['child'], 'pubDate' );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( strtotime( $post->post_date_gmt ), strtotime( $pubdate[0]['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">-                        // Author

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Author.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $creator = xml_find( $items[ $key ]['child'], 'dc:creator' );

</span><span class="cx" style="display: block; padding: 0 10px">                        $user    = new WP_User( $post->post_author );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $user->display_name, $creator[0]['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">-                        // Categories (perhaps multiple)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Categories (perhaps multiple).

</ins><span class="cx" style="display: block; padding: 0 10px">                         $categories = xml_find( $items[ $key ]['child'], 'category' );

</span><span class="cx" style="display: block; padding: 0 10px">                        $cats       = array();

</span><span class="cx" style="display: block; padding: 0 10px">                        foreach ( get_the_category( $post->ID ) as $term ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -232,32 +232,32 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                }

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                        $cats = array_filter( $cats );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Should be the same number of categories

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Should be the same number of categories.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertEquals( count( $cats ), count( $categories ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // ..with the same names

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // ..with the same names.

</ins><span class="cx" style="display: block; padding: 0 10px">                         foreach ( $cats as $id => $cat ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->assertEquals( $cat, $categories[ $id ]['content'] );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // GUID

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // GUID.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $guid = xml_find( $items[ $key ]['child'], 'guid' );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( 'false', $guid[0]['attributes']['isPermaLink'] );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $post->guid, $guid[0]['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">-                        // Description / Excerpt

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Description / Excerpt.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( ! empty( $post->post_excerpt ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $description = xml_find( $items[ $key ]['child'], 'description' );

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->assertEquals( trim( $post->post_excerpt ), trim( $description[0]['content'] ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Post content

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Post content.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( ! $this->excerpt_only ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $content = xml_find( $items[ $key ]['child'], 'content:encoded' );

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->assertEquals( trim( apply_filters( 'the_content', $post->post_content ) ), trim( $content[0]['content'] ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Comment rss

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Comment RSS.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $comment_rss = xml_find( $items[ $key ]['child'], 'wfw:commentRss' );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( html_entity_decode( get_post_comments_feed_link( $post->ID ) ), $comment_rss[0]['content'] );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -273,21 +273,21 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $feed = $this->do_rss2();

</span><span class="cx" style="display: block; padding: 0 10px">                $xml  = xml_to_array( $feed );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // get all the rss -> channel -> item elements

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Get all the rss -> channel -> item elements.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $items = xml_find( $xml, 'rss', 'channel', 'item' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // check each of the items against the known post data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check each of the items against the known post data.

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $items as $key => $item ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Get post for comparison

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Get post for comparison.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $guid = xml_find( $items[ $key ]['child'], 'guid' );

</span><span class="cx" style="display: block; padding: 0 10px">                        preg_match( '/\?p=(\d+)/', $guid[0]['content'], $matches );

</span><span class="cx" style="display: block; padding: 0 10px">                        $post = get_post( $matches[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">-                        // comment link

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Comment link.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $comments_link = xml_find( $items[ $key ]['child'], 'comments' );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEmpty( $comments_link );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // comment rss

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Comment RSS.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $comment_rss = xml_find( $items[ $key ]['child'], 'wfw:commentRss' );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEmpty( $comment_rss );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -358,7 +358,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 30210

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_valid_main_comment_feed_endpoint() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Generate a bunch of comments

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Generate a bunch of comments.

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( self::$posts as $post ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        self::factory()->comment->create_post_comments( $post, 3 );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -447,7 +447,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 30210

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_valid_search_feed_endpoint() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // An example of an valid search feed endpoint

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // An example of an valid search feed endpoint.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->go_to( '?s=Lorem&feed=rss' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Verify the query object is a feed.

</span></span></pre></div>

<a id="trunktestsphpunittestsfilephp"></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/file.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/file.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/file.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,12 +71,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $fullpath = $path . DIRECTORY_SEPARATOR . $filename;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $fp = fopen( $fullpath, 'x' );

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // file already exists?

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // File already exists?

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! $fp ) {

</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">-                // write some random contents

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Write some random contents.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $c = rand_str();

</span><span class="cx" style="display: block; padding: 0 10px">                fwrite( $fp, $c );

</span><span class="cx" style="display: block; padding: 0 10px">                fclose( $fp );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,7 +91,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_unique_filename_is_valid() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // make sure it produces a valid, writable, unique filename

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure it produces a valid, writable, unique filename.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $filename = wp_unique_filename( $this->dir, __FUNCTION__ . '.txt' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $this->is_unique_writable_file( $this->dir, $filename ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,7 +100,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">        function test_unique_filename_is_unique() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // make sure it produces two unique filenames

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure it produces two unique filenames.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $name = __FUNCTION__;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $filename1 = wp_unique_filename( $this->dir, $name . '.txt' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -108,7 +108,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $filename2 = wp_unique_filename( $this->dir, $name . '.txt' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $this->is_unique_writable_file( $this->dir, $filename2 ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // the two should be different

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // The two should be different.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertNotEquals( $filename1, $filename2 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                unlink( $this->dir . DIRECTORY_SEPARATOR . $filename1 );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -119,7 +119,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $name     = __FUNCTION__;

</span><span class="cx" style="display: block; padding: 0 10px">                $filename = wp_unique_filename( $this->dir, $name . $this->badchars . '.txt' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // make sure the bad characters were all stripped out

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure the bad characters were all stripped out.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $name . '.txt', $filename );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $this->is_unique_writable_file( $this->dir, $filename ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -132,7 +132,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                // "foo/foo.txt"

</span><span class="cx" style="display: block; padding: 0 10px">                $filename = wp_unique_filename( $this->dir, $name . '/' . $name . '.txt' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // the slash should be removed, i.e. "foofoo.txt"

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // The slash should be removed, i.e. "foofoo.txt".

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $name . $name . '.txt', $filename );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $this->is_unique_writable_file( $this->dir, $filename ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -144,7 +144,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $name     = __FUNCTION__;

</span><span class="cx" style="display: block; padding: 0 10px">                $filename = wp_unique_filename( $this->dir, $name . '.php.txt' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // "foo.php.txt" becomes "foo.php_.txt"

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // "foo.php.txt" becomes "foo.php_.txt".

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $name . '.php_.txt', $filename );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $this->is_unique_writable_file( $this->dir, $filename ) );

</span></span></pre></div>

<a id="trunktestsphpunittestsfilesystembasephp"></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/filesystem/base.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/filesystem/base.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/filesystem/base.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,12 +33,12 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_filesystem->init( '/' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test creation/exists checks

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test creation/exists checks.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( $wp_filesystem->is_dir( '/test/' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_filesystem->mkdir( '/test' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $wp_filesystem->exists( '/test' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $wp_filesystem->is_dir( '/test/' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $wp_filesystem->is_file( '/test' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //$this->assertFalse( true );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // $this->assertFalse( true );

</ins><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="trunktestsphpunittestsfilesystemfindFolderphp"></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/filesystem/findFolder.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/filesystem/findFolder.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/filesystem/findFolder.php 2020-01-29 00:43:23 UTC (rev 47122)

</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">                $path = $fs->abspath( '/var/www/example.com/sub/' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( '/example.com/sub/', $path );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // sub.example.com - Plugins

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // sub.example.com - Plugins.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $path = $fs->find_folder( '/var/www/example.com/sub/wp-content/plugins/' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( '/example.com/sub/wp-content/plugins/', $path );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span></span></pre></div>

<a id="trunktestsphpunittestsfiltersphp"></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/filters.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/filters.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/filters.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,9 +15,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( $tag, array( $a, 'filter' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $val, apply_filters( $tag, $val ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // only one event occurred for the hook, with empty args

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Only one event occurred for the hook, with empty args.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 1, $a->get_call_count() );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // only our hook was called

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Only our hook was called.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( array( $tag ), $a->get_tags() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $argsvar = $a->get_args();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,11 +33,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( $tag, array( $a, 'filter' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $val, apply_filters( $tag, $val ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // make sure our hook was called correctly

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure our hook was called correctly.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 1, $a->get_call_count() );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array( $tag ), $a->get_tags() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // now remove the filter, do it again, and make sure it's not called this time

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Now remove the filter, do it again, and make sure it's not called this time.

</ins><span class="cx" style="display: block; padding: 0 10px">                 remove_filter( $tag, array( $a, 'filter' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $val, apply_filters( $tag, $val ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 1, $a->get_call_count() );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -59,7 +59,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertFalse( has_filter( $tag ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // one tag with multiple filters

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // One tag with multiple filters.

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_multiple_filters() {

</span><span class="cx" style="display: block; padding: 0 10px">                $a1  = new MockAction();

</span><span class="cx" style="display: block; padding: 0 10px">                $a2  = new MockAction();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,13 +66,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $tag = __FUNCTION__;

</span><span class="cx" style="display: block; padding: 0 10px">                $val = __FUNCTION__ . '_val';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // add both filters to the hook

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Add both filters to the hook.

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_filter( $tag, array( $a1, 'filter' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( $tag, array( $a2, 'filter' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $val, apply_filters( $tag, $val ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // both filters called once each

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Both filters called once each.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 1, $a1->get_call_count() );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 1, $a2->get_call_count() );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,7 +84,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $arg1 = __FUNCTION__ . '_arg1';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( $tag, array( $a, 'filter' ), 10, 2 );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // call the filter with a single argument

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Call the filter with a single argument.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $val, apply_filters( $tag, $val, $arg1 ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 1, $a->get_call_count() );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,18 +100,18 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $arg1 = __FUNCTION__ . '_arg1';

</span><span class="cx" style="display: block; padding: 0 10px">                $arg2 = __FUNCTION__ . '_arg2';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // a1 accepts two arguments, a2 doesn't

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // $a1 accepts two arguments, $a2 doesn't.

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_filter( $tag, array( $a1, 'filter' ), 10, 3 );

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( $tag, array( $a2, 'filter' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // call the filter with two arguments

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Call the filter with two arguments.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $val, apply_filters( $tag, $val, $arg1, $arg2 ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // a1 should be called with both args

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // $a1 should be called with both args.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 1, $a1->get_call_count() );

</span><span class="cx" style="display: block; padding: 0 10px">                $argsvar1 = $a1->get_args();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array( $val, $arg1, $arg2 ), array_pop( $argsvar1 ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // a2 should be called with one only

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // $a2 should be called with one only.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 1, $a2->get_call_count() );

</span><span class="cx" style="display: block; padding: 0 10px">                $argsvar2 = $a2->get_args();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array( $val ), array_pop( $argsvar2 ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -122,22 +122,22 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $tag = __FUNCTION__;

</span><span class="cx" style="display: block; padding: 0 10px">                $val = __FUNCTION__ . '_val';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // make two filters with different priorities

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make two filters with different priorities.

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_filter( $tag, array( $a, 'filter' ), 10 );

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( $tag, array( $a, 'filter2' ), 9 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $val, apply_filters( $tag, $val ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // there should be two events, one per filter

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // There should be two events, one per filter.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 2, $a->get_call_count() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // filter2 is called first because it has priority 9

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // 'filter2' is called first because it has priority 9.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'filter' => 'filter2',

</span><span class="cx" style="display: block; padding: 0 10px">                                'tag'    => $tag,

</span><span class="cx" style="display: block; padding: 0 10px">                                'args'   => array( $val ),

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // filter 1 is called second

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // 'filter' is called second.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'filter' => 'filter',

</span><span class="cx" style="display: block; padding: 0 10px">                                'tag'    => $tag,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -154,17 +154,17 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $tag2 = __FUNCTION__ . '_2';

</span><span class="cx" style="display: block; padding: 0 10px">                $val  = __FUNCTION__ . '_val';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // add an 'all' filter

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Add an 'all' filter.

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_filter( 'all', array( $a, 'filterall' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // do some filters

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Apply some filters.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $val, apply_filters( $tag1, $val ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $val, apply_filters( $tag2, $val ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $val, apply_filters( $tag1, $val ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $val, apply_filters( $tag1, $val ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // our filter should have been called once for each apply_filters call

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Our filter should have been called once for each apply_filters call.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 4, $a->get_call_count() );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // the right hooks should have been called in order

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // The right hooks should have been called in order.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( array( $tag1, $tag2, $tag1, $tag1 ), $a->get_tags() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                remove_filter( 'all', array( $a, 'filterall' ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -182,16 +182,16 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 10, has_filter( 'all', array( $a, 'filterall' ) ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $val, apply_filters( $tag, $val ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // make sure our hook was called correctly

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure our hook was called correctly.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 1, $a->get_call_count() );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array( $tag ), $a->get_tags() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // now remove the filter, do it again, and make sure it's not called this time

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Now remove the filter, do it again, and make sure it's not called this time.

</ins><span class="cx" style="display: block; padding: 0 10px">                 remove_filter( 'all', array( $a, 'filterall' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( has_filter( 'all', array( $a, 'filterall' ) ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( has_filter( 'all' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $val, apply_filters( $tag, $val ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // call cound should remain at 1

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Call cound should remain at 1.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 1, $a->get_call_count() );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array( $tag ), $a->get_tags() );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -229,7 +229,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $args = $a->get_args();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( $args[0][0], $obj );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // just in case we don't trust assertSame

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Just in case we don't trust assertSame().

</ins><span class="cx" style="display: block; padding: 0 10px">                 $obj->foo = true;

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( empty( $args[0][0]->foo ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -252,13 +252,13 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $args = $a->get_args();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( $args[0][1], $obj );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // just in case we don't trust assertSame

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Just in case we don't trust assertSame().

</ins><span class="cx" style="display: block; padding: 0 10px">                 $obj->foo = true;

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( empty( $args[0][1]->foo ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $args = $b->get_args();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( $args[0][1], $obj );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // just in case we don't trust assertSame

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Just in case we don't trust assertSame().

</ins><span class="cx" style="display: block; padding: 0 10px">                 $obj->foo = true;

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( empty( $args[0][1]->foo ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -277,7 +277,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $tag = __FUNCTION__;

</span><span class="cx" style="display: block; padding: 0 10px">                $val = __FUNCTION__ . '_val';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // No priority

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // No priority.

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_filter( $tag, array( $a, 'filter' ), 11 );

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( $tag, array( $a, 'filter' ), 12 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( has_filter( $tag ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -285,7 +285,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                remove_all_filters( $tag );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( has_filter( $tag ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Remove priorities one at a time

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Remove priorities one at a time.

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_filter( $tag, array( $a, 'filter' ), 11 );

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( $tag, array( $a, 'filter' ), 12 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( has_filter( $tag ) );

</span></span></pre></div>

<a id="trunktestsphpunittestsformattingAutopphp"></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/formatting/Autop.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/Autop.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/formatting/Autop.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,7 +4,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">  * @group formatting

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Formatting_Autop extends WP_UnitTestCase {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        //From ticket https://core.trac.wordpress.org/ticket/11008

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

+       /**

+        * @ticket 11008

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_first_post() {

</span><span class="cx" style="display: block; padding: 0 10px">                $expected  = '<p>Welcome to WordPress!  This post contains important information.  After you read it, you can make it private to hide it from visitors but still have the information handy for future reference.</p>

</span><span class="cx" style="display: block; padding: 0 10px"> <p>First things first:</p>

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,7 +59,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> PS.  Not yet subscribed for update notifications?  <a href="%1$s" title="Subscribe to the WordPress mailing list for Release Notifications">Do it now!</a>

</span><span class="cx" style="display: block; padding: 0 10px"> ';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // On windows environments, the EOL-style is \r\n

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // On Windows environments, the EOL-style is \r\n.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $expected = str_replace( "\r\n", "\n", $expected );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected, wpautop( $test_data ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,18 +75,18 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $code = str_replace( "\r", '', $code );

</span><span class="cx" style="display: block; padding: 0 10px">                $code = htmlentities( $code );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Not wrapped in <p> tags

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Not wrapped in  tags.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $str = "<pre>$code</pre>";

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $str, trim( wpautop( $str ) ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Text before/after is wrapped in <p> tags

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Text before/after is wrapped in  tags.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $str = "Look at this code\n\n<pre>$code</pre>\n\nIsn't that cool?";

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Expected text after wpautop

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Expected text after wpautop().

</ins><span class="cx" style="display: block; padding: 0 10px">                 $expected = '<p>Look at this code</p>' . "\n<pre>" . $code . "</pre>\n" . '<p>Isn\'t that cool?</p>';

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected, trim( wpautop( $str ) ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make sure HTML breaks are maintained if manually inserted

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure HTML breaks are maintained if manually inserted.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $str      = "Look at this code\n\n<pre>Line1<br />Line2<br>Line3<br/>Line4\nActual Line 2\nActual Line 3</pre>\n\nCool, huh?";

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = "<p>Look at this code</p>\n<pre>Line1<br />Line2<br>Line3<br/>Line4\nActual Line 2\nActual Line 3</pre>\n<p>Cool, huh?</p>";

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected, trim( wpautop( $str ) ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -142,7 +145,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        </video>' .

</span><span class="cx" style="display: block; padding: 0 10px">                        "\n\nParagraph two.";

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $expected = "<p>Paragraph one.</p>\n" . // line breaks only after <p>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $expected = "<p>Paragraph one.</p>\n" . // Line breaks only after <p>.

</ins><span class="cx" style="display: block; padding: 0 10px">                         '<p><video class="wp-video-shortcode" id="video-0-1" width="640" height="360" preload="metadata" controls="controls">' .

</span><span class="cx" style="display: block; padding: 0 10px">                        '<source type="video/mp4" src="http://domain.tld/wp-content/uploads/2013/12/xyz.mp4" />' .

</span><span class="cx" style="display: block; padding: 0 10px">                        '<!-- WebM/VP8 for Firefox4, Opera, and Chrome -->' .

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -157,7 +160,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        "http://domain.tld/wp-content/uploads/2013/12/xyz.mp4</a></video></p>\n" .

</span><span class="cx" style="display: block; padding: 0 10px">                        '<p>Paragraph two.</p>';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // When running the content through wpautop() from wp_richedit_pre()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // When running the content through wpautop() from wp_richedit_pre().

</ins><span class="cx" style="display: block; padding: 0 10px">                 $shortcode_content = "Paragraph one.\n\n" .

</span><span class="cx" style="display: block; padding: 0 10px">                        '[video width="720" height="480" mp4="http://domain.tld/wp-content/uploads/2013/12/xyz.mp4"]

</span><span class="cx" style="display: block; padding: 0 10px">                        <!-- WebM/VP8 for Firefox4, Opera, and Chrome -->

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -171,7 +174,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        [/video]' .

</span><span class="cx" style="display: block; padding: 0 10px">                        "\n\nParagraph two.";

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $shortcode_expected = "<p>Paragraph one.</p>\n" . // line breaks only after <p>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $shortcode_expected = "<p>Paragraph one.</p>\n" . // Line breaks only after <p>.

</ins><span class="cx" style="display: block; padding: 0 10px">                         '<p>[video width="720" height="480" mp4="http://domain.tld/wp-content/uploads/2013/12/xyz.mp4"]' .

<span class="cx" style="display: block; padding: 0 10px">                        '<source type="video/webm" src="myvideo.webm" />' .

<span class="cx" style="display: block; padding: 0 10px">                        '<source type="video/ogg" src="myvideo.ogv" />' .

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -206,7 +209,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> Paragraph two.';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $expected1 = "<p>Paragraph one.</p>\n" . // line breaks only after <p>

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $expected1 = "<p>Paragraph one.</p>\n" . // Line breaks only after <p>.

</ins><span class="cx" style="display: block; padding: 0 10px">                         '<p><object width="400" height="224" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0">' .

</span><span class="cx" style="display: block; padding: 0 10px">                        '<param name="src" value="http://domain.tld/wp-content/uploads/2013/12/xyz.swf" />' .

</span><span class="cx" style="display: block; padding: 0 10px">                        '<param name="allowfullscreen" value="true" />' .

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -242,7 +245,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> Paragraph two.';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $expected2 = "<p>Paragraph one.</p>\n" . // line breaks only after block tags

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $expected2 = "Paragraph one.\n" . // Line breaks only after block tags.

</ins><span class="cx" style="display: block; padding: 0 10px">                         '<div class="video-player" id="x-video-0">' . "\n" .

</span><span class="cx" style="display: block; padding: 0 10px">                        '<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="640" height="360" id="video-0" standby="Standby text">' .

</span><span class="cx" style="display: block; padding: 0 10px">                        '<param name="movie" value="http://domain.tld/wp-content/uploads/2013/12/xyz.swf" />' .

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -335,11 +338,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = join( "\n", $content );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $input    = join( "\n\n", $content ); // WS difference

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $input    = join( "\n\n", $content ); // Whitespace difference.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected, trim( wpautop( $input ) ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $input = join( '', $content ); // WS difference

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $input = join( '', $content ); // Whitespace difference.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected, trim( wpautop( $input ) ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunktestsphpunittestsformattingBlogInfophp"></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/formatting/BlogInfo.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/BlogInfo.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/formatting/BlogInfo.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,7 +22,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function locales() {

</span><span class="cx" style="display: block; padding: 0 10px">                return array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        //     Locale          Language code

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Locale, language code.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( 'en_US', 'en-US' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( 'ar', 'ar' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( 'de_DE', 'de-DE' ),

</span></span></pre></div>

<a id="trunktestsphpunittestsformattingEmojiphp"></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/formatting/Emoji.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/Emoji.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/formatting/Emoji.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,22 +82,22 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function data_wp_encode_emoji() {

</span><span class="cx" style="display: block; padding: 0 10px">                return array(

</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">-                                // Not emoji

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Not emoji.

</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="cx" style="display: block; padding: 0 10px">                        array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Simple emoji

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Simple emoji.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '🙂',

</span><span class="cx" style="display: block; padding: 0 10px">                                '&#x1f642;',

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</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">-                                // Skin tone, gender, ZWJ, emoji selector

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Skin tone, gender, ZWJ, emoji selector.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '👮🏼‍♀️',

</span><span class="cx" style="display: block; padding: 0 10px">                                '&#x1f46e;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;',

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</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">-                                // Unicode 10

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Unicode 10.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '🧚',

</span><span class="cx" style="display: block; padding: 0 10px">                                '&#x1f9da;',

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,22 +115,22 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function data_wp_staticize_emoji() {

</span><span class="cx" style="display: block; padding: 0 10px">                $data = array(

</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">-                                // Not emoji

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Not emoji.

</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="cx" style="display: block; padding: 0 10px">                        array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Simple emoji

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Simple emoji.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '🙂',

</span><span class="cx" style="display: block; padding: 0 10px">                                '<img src="' . $this->png_cdn . '1f642.png" alt="🙂" class="wp-smiley" style="height: 1em; max-height: 1em;" />',

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</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">-                                // Skin tone, gender, ZWJ, emoji selector

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Skin tone, gender, ZWJ, emoji selector.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '👮🏼‍♀️',

</span><span class="cx" style="display: block; padding: 0 10px">                                '<img src="' . $this->png_cdn . '1f46e-1f3fc-200d-2640-fe0f.png" alt="👮🏼‍♀️" class="wp-smiley" style="height: 1em; max-height: 1em;" />',

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</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">-                                // Unicode 10

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Unicode 10.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '🧚',

</span><span class="cx" style="display: block; padding: 0 10px">                                '<img src="' . $this->png_cdn . '1f9da.png" alt="🧚" class="wp-smiley" style="height: 1em; max-height: 1em;" />',

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span></span></pre></div>

<a id="trunktestsphpunittestsformattingEscHtmlphp"></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/formatting/EscHtml.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/EscHtml.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/formatting/EscHtml.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,16 +5,16 @@

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Formatting_EscHtml extends WP_UnitTestCase {

</span><span class="cx" style="display: block; padding: 0 10px">        function test_esc_html_basics() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Simple string

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Simple string.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $html = 'The quick brown fox.';

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $html, esc_html( $html ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // URL with &

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // URL with &.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $html    = 'http://localhost/trunk/wp-login.php?action=logout&_wpnonce=cd57d75985';

</span><span class="cx" style="display: block; padding: 0 10px">                $escaped = 'http://localhost/trunk/wp-login.php?action=logout&amp;_wpnonce=cd57d75985';

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $escaped, esc_html( $html ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // SQL query

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // SQL query.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $html    = "SELECT meta_key, meta_value FROM wp_trunk_sitemeta WHERE meta_key IN ('site_name', 'siteurl', 'active_sitewide_plugins', '_site_transient_timeout_theme_roots', '_site_transient_theme_roots', 'site_admins', 'can_compress_scripts', 'global_terms_enabled') AND site_id = 1";

</span><span class="cx" style="display: block; padding: 0 10px">                $escaped = 'SELECT meta_key, meta_value FROM wp_trunk_sitemeta WHERE meta_key IN (&#039;site_name&#039;, &#039;siteurl&#039;, &#039;active_sitewide_plugins&#039;, &#039;_site_transient_timeout_theme_roots&#039;, &#039;_site_transient_theme_roots&#039;, &#039;site_admins&#039;, &#039;can_compress_scripts&#039;, &#039;global_terms_enabled&#039;) AND site_id = 1';

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $escaped, esc_html( $html ) );

</span></span></pre></div>

<a id="trunktestsphpunittestsformattingEscUrlphp"></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/formatting/EscUrl.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/EscUrl.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/formatting/EscUrl.php     2020-01-29 00:43:23 UTC (rev 47122)

</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">                $this->assertEquals( 'http://example.com/watchthelinefeedgo', esc_url( 'http://example.com/watchthelinefeed%0ago' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'http://example.com/watchthecarriagereturngo', esc_url( 'http://example.com/watchthecarriagereturn%0Dgo' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'http://example.com/watchthecarriagereturngo', esc_url( 'http://example.com/watchthecarriagereturn%0dgo' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //Nesting Checks

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Nesting checks.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 'http://example.com/watchthecarriagereturngo', esc_url( 'http://example.com/watchthecarriagereturn%0%0ddgo' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'http://example.com/watchthecarriagereturngo', esc_url( 'http://example.com/watchthecarriagereturn%0%0DDgo' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'http://example.com/', esc_url( 'http://example.com/%0%0%0DAD' ) );

</span></span></pre></div>

<a id="trunktestsphpunittestsformattingGetUrlInContentphp"></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/formatting/GetUrlInContent.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/GetUrlInContent.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/formatting/GetUrlInContent.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,30 +12,30 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function get_input_output() {

</span><span class="cx" style="display: block; padding: 0 10px">                return array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        array(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 array( // Empty content.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '',

</span><span class="cx" style="display: block; padding: 0 10px">                                false,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        ), //empty content

-                       array(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 ),

+                       array( // No URLs.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '<div>NO URL CONTENT</div>',

</span><span class="cx" style="display: block; padding: 0 10px">                                false,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        ), //no URLs

-                       array(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 ),

+                       array( // Ignore none link elements.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '<div href="/relative.php">NO URL CONTENT</div>',

</span><span class="cx" style="display: block; padding: 0 10px">                                false,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        ), // ignore none link elements

-                       array(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 ),

+                       array( // Single link.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'ABC<div><a href="/relative.php">LINK</a> CONTENT</div>',

</span><span class="cx" style="display: block; padding: 0 10px">                                '/relative.php',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        ), // single link

-                       array(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 ),

+                       array( // Multiple links.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'ABC<div><a href="/relative.php">LINK</a> CONTENT <a href="/suppress.php">LINK</a></div>',

</span><span class="cx" style="display: block; padding: 0 10px">                                '/relative.php',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        ), // multiple links

-                       array(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 ),

+                       array( // Escape link.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'ABC<div><a href="http://example.com/Mr%20WordPress 2">LINK</a> CONTENT </div>',

</span><span class="cx" style="display: block; padding: 0 10px">                                'http://example.com/Mr%20WordPress%202',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        ), // escape link

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 ),

</ins><span class="cx" style="display: block; padding: 0 10px">                 );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunktestsphpunittestsformattingJSEscapephp"></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/formatting/JSEscape.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/JSEscape.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/formatting/JSEscape.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,7 +11,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_js_escape_quotes() {

</span><span class="cx" style="display: block; padding: 0 10px">                $out = esc_js( 'foo "bar" \'baz\'' );

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // does it make any sense to change " into &quot;?  Why not \"?

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Does it make any sense to change " into &quot;?  Why not \"?

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( "foo &quot;bar&quot; \'baz\'", $out );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,13 +34,13 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_js_no_carriage_return() {

</span><span class="cx" style="display: block; padding: 0 10px">                $out = esc_js( "foo\rbar\nbaz\r" );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // \r is stripped

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // \r is stripped.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertequals( "foobar\\nbaz", $out );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_js_escape_rn() {

</span><span class="cx" style="display: block; padding: 0 10px">                $out = esc_js( "foo\r\nbar\nbaz\r\n" );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // \r is stripped

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // \r is stripped.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertequals( "foo\\nbar\\nbaz\\n", $out );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span></span></pre></div>

<a id="trunktestsphpunittestsformattingLikeEscapephp"></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/formatting/LikeEscape.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/LikeEscape.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/formatting/LikeEscape.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,10 +11,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_like_escape() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $inputs   = array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'howdy%', //Single Percent

-                       'howdy_', //Single Underscore

-                       'howdy\\', //Single slash

-                       'howdy\\howdy%howdy_', //The works

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'howdy%',              // Single percent.

+                       'howdy_',              // Single underscore.

+                       'howdy\\',             // Single slash.

+                       'howdy\\howdy%howdy_', // The works.

</ins><span class="cx" style="display: block; padding: 0 10px">                 );

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'howdy\\%',

</span></span></pre></div>

<a id="trunktestsphpunittestsformattingMakeClickablephp"></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/formatting/MakeClickable.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/MakeClickable.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/formatting/MakeClickable.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,8 +36,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // tests that make_clickable will not link trailing periods, commas and

-       // (semi-)colons in URLs with protocol (i.e. http://wordpress.org)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**

+        * Tests that make_clickable() will not link trailing periods, commas,

+        * and (semi-)colons in URLs with protocol (i.e. http://wordpress.org).

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_strip_trailing_with_protocol() {

</span><span class="cx" style="display: block; padding: 0 10px">                $urls_before   = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'http://wordpress.org/hello.html',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -61,8 +63,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // tests that make_clickable will not link trailing periods, commas and

-       // (semi-)colons in URLs with protocol (i.e. http://wordpress.org)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**

+        * Tests that make_clickable() will not link trailing periods, commas,

+        * and (semi-)colons in URLs with protocol (i.e. http://wordpress.org).

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_strip_trailing_with_protocol_nothing_afterwards() {

</span><span class="cx" style="display: block; padding: 0 10px">                $urls_before   = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'http://wordpress.org/hello.html',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -88,8 +92,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // tests that make_clickable will not link trailing periods, commas and

-       // (semi-)colons in URLs without protocol (i.e. www.wordpress.org)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**

+        * Tests that make_clickable() will not link trailing periods, commas,

+        * and (semi-)colons in URLs without protocol (i.e. www.wordpress.org).

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_strip_trailing_without_protocol() {

</span><span class="cx" style="display: block; padding: 0 10px">                $urls_before   = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'www.wordpress.org',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -113,8 +119,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // tests that make_clickable will not link trailing periods, commas and

-       // (semi-)colons in URLs without protocol (i.e. www.wordpress.org)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**

+        * Tests that make_clickable() will not link trailing periods, commas,

+        * and (semi-)colons in URLs without protocol (i.e. www.wordpress.org).

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_strip_trailing_without_protocol_nothing_afterwards() {

</span><span class="cx" style="display: block; padding: 0 10px">                $urls_before   = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'www.wordpress.org',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -138,7 +146,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // #4570

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**

+        * @ticket 4570

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_iri() {

</span><span class="cx" style="display: block; padding: 0 10px">                $urls_before   = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'http://www.詹姆斯.com/',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -155,7 +165,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // #10990

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**

+        * @ticket 10990

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_brackets_in_urls() {

</span><span class="cx" style="display: block; padding: 0 10px">                $urls_before   = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -190,7 +202,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Based on a real comments which were incorrectly linked. #11211

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**

+        * Based on real comments which were incorrectly linked.

+        *

+        * @ticket 11211

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_real_world_examples() {

</span><span class="cx" style="display: block; padding: 0 10px">                $urls_before   = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'Example: WordPress, test (some text), I love example.com (http://example.org), it is brilliant',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -209,7 +225,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // #14993

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**

+        * @ticket 14993

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_twitter_hash_bang() {

</span><span class="cx" style="display: block; padding: 0 10px">                $urls_before   = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'http://twitter.com/#!/wordpress/status/25907440233',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -349,7 +367,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_no_links_within_links() {

</span><span class="cx" style="display: block; padding: 0 10px">                $in = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'Some text with a link <a href="http://example.com">http://example.com</a>',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        //'<a href="http://wordpress.org">This is already a link www.wordpress.org</a>', // fails in 3.3.1 too

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // '<a href="http://wordpress.org">This is already a link www.wordpress.org</a>', // Fails in 3.3.1 too.

</ins><span class="cx" style="display: block; padding: 0 10px">                 );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $in as $text ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $text, make_clickable( $text ) );

</span></span></pre></div>

<a id="trunktestsphpunittestsformattingRemoveAccentsphp"></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/formatting/RemoveAccents.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/RemoveAccents.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/formatting/RemoveAccents.php      2020-01-29 00:43:23 UTC (rev 47122)

</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">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_remove_accents_iso8859() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // File is Latin1 encoded

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // File is Latin1-encoded.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $file   = DIR_TESTDATA . '/formatting/remove_accents.01.input.txt';

</span><span class="cx" style="display: block; padding: 0 10px">                $input  = file_get_contents( $file );

</span><span class="cx" style="display: block; padding: 0 10px">                $input  = trim( $input );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,18 +48,18 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 17738

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_remove_accents_vowels_diacritic() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Vowels with diacritic

-               // unmarked

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Vowels with diacritic.

+               // Unmarked.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 'OoUu', remove_accents( 'ƠơƯư' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // grave accent

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Grave accent.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 'AaAaEeOoOoUuYy', remove_accents( 'ẦầẰằỀềỒồỜờỪừỲỳ' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // hook

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Hook.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 'AaAaAaEeEeIiOoOoOoUuUuYy', remove_accents( 'ẢảẨẩẲẳẺẻỂểỈỉỎỏỔổỞởỦủỬửỶỷ' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // tilde

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Tilde.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 'AaAaEeEeOoOoUuYy', remove_accents( 'ẪẫẴẵẼẽỄễỖỗỠỡỮữỸỹ' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // acute accent

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Acute accent.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 'AaAaEeOoOoUu', remove_accents( 'ẤấẮắẾếỐốỚớỨứ' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // dot below

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Dot below.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 'AaAaAaEeEeIiOoOoOoUuUuYy', remove_accents( 'ẠạẬậẶặẸẹỆệỊịỌọỘộỢợỤụỰựỴỵ' ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,16 +67,16 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 20772

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_remove_accents_hanyu_pinyin() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Vowels with diacritic (Chinese, Hanyu Pinyin)

-               // macron

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Vowels with diacritic (Chinese, Hanyu Pinyin).

+               // Macron.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 'aeiouuAEIOUU', remove_accents( 'āēīōūǖĀĒĪŌŪǕ' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // acute accent

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Acute accent.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 'aeiouuAEIOUU', remove_accents( 'áéíóúǘÁÉÍÓÚǗ' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // caron

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Caron.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 'aeiouuAEIOUU', remove_accents( 'ǎěǐǒǔǚǍĚǏǑǓǙ' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // grave accent

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Grave accent.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 'aeiouuAEIOUU', remove_accents( 'àèìòùǜÀÈÌÒÙǛ' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // unmarked

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Unmarked.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 'aaeiouuAEIOUU', remove_accents( 'aɑeiouüAEIOUÜ' ) );

</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="trunktestsphpunittestsformattingSanitizeMimeTypephp"></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/formatting/SanitizeMimeType.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/SanitizeMimeType.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/formatting/SanitizeMimeType.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,7 +4,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">  * @group formatting

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Formatting_SanitizeMimeType extends WP_UnitTestCase {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // 17855

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

+       /**

+        * @ticket 17855

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_sanitize_valid_mime_type() {

</span><span class="cx" style="display: block; padding: 0 10px">                $inputs = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'application/atom+xml',

</span></span></pre></div>

<a id="trunktestsphpunittestsformattingSanitizeTextFieldphp"></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/formatting/SanitizeTextField.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/SanitizeTextField.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/formatting/SanitizeTextField.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,11 +7,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function data_sanitize_text_field() {

</span><span class="cx" style="display: block; padding: 0 10px">                return array(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                'оРангутанг', //Ensure UTF8 text is safe the Р is D0 A0 and A0 is the non-breaking space.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         'оРангутанг', // Ensure UTF-8 text is safe. The Р is D0 A0 and A0 is the non-breaking space.

</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">                        array(

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                'САПР', //Ensure UTF8 text is safe the Р is D0 A0 and A0 is the non-breaking space.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         'САПР',       // Ensure UTF-8 text is safe. the Р is D0 A0 and A0 is the non-breaking space.

</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">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,8 +82,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">                        array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                '%AB%BC%DE', //Just octets

-                               '', //Emtpy as we strip all the octets out

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         '%AB%BC%DE', // Just octets.

+                               '',          // Emtpy as we strip all the octets out.

</ins><span class="cx" style="display: block; padding: 0 10px">                         ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'Invalid octects remain %II',

</span></span></pre></div>

<a id="trunktestsphpunittestsformattingSeemsUtf8php"></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/formatting/SeemsUtf8.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/SeemsUtf8.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/formatting/SeemsUtf8.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,7 +11,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @dataProvider utf8_strings

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_returns_true_for_utf8_strings( $utf8_string ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // from http://www.i18nguy.com/unicode-example.html

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // From http://www.i18nguy.com/unicode-example.html

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( seems_utf8( $utf8_string ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,7 +32,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">        function big5_strings() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Get data from formatting/big5.txt

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Get data from formatting/big5.txt.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $big5_strings = file( DIR_TESTDATA . '/formatting/big5.txt' );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $big5_strings as &$string ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $string = (array) trim( $string );

</span></span></pre></div>

<a id="trunktestsphpunittestsformattingSmiliesphp"></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/formatting/Smilies.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/Smilies.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/formatting/Smilies.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,7 +49,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * when use_smilies = 1 and not when use_smilies = 0

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_convert_standard_smilies( $in_txt, $converted_txt ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // standard smilies, use_smilies: ON

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Standard smilies, use_smilies: ON.

</ins><span class="cx" style="display: block; padding: 0 10px">                 update_option( 'use_smilies', 1 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                smilies_init();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,7 +56,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $converted_txt, convert_smilies( $in_txt ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // standard smilies, use_smilies: OFF

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Standard smilies, use_smilies: OFF.

</ins><span class="cx" style="display: block; padding: 0 10px">                 update_option( 'use_smilies', 0 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $in_txt, convert_smilies( $in_txt ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,7 +94,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_convert_custom_smilies( $in_txt, $converted_txt ) {

</span><span class="cx" style="display: block; padding: 0 10px">                global $wpsmiliestrans;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // custom smilies, use_smilies: ON

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Custom smilies, use_smilies: ON.

</ins><span class="cx" style="display: block; padding: 0 10px">                 update_option( 'use_smilies', 1 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! isset( $wpsmiliestrans ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -101,7 +101,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        smilies_init();

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $trans_orig = $wpsmiliestrans; // save original translations array

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $trans_orig = $wpsmiliestrans; // Save original translations array.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $wpsmiliestrans = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        ':PP'      => 'icon_tongue.gif',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -114,12 +114,12 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $converted_txt, convert_smilies( $in_txt ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // standard smilies, use_smilies: OFF

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Standard smilies, use_smilies: OFF.

</ins><span class="cx" style="display: block; padding: 0 10px">                 update_option( 'use_smilies', 0 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $in_txt, convert_smilies( $in_txt ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $wpsmiliestrans = $trans_orig; // reset original translations array

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $wpsmiliestrans = $trans_orig; // Reset original translations array.

</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">@@ -149,13 +149,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $in_str  = 'Do we ingore smilies ;-) in ' . $element . ' tags <' . $element . ' class="foo">My Content Here :?: </' . $element . '>';

</span><span class="cx" style="display: block; padding: 0 10px">                $exp_str = "Do we ingore smilies \xf0\x9f\x98\x89 in $element tags <$element class=\"foo\">My Content Here :?: </$element>";

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // standard smilies, use_smilies: ON

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Standard smilies, use_smilies: ON.

</ins><span class="cx" style="display: block; padding: 0 10px">                 update_option( 'use_smilies', 1 );

</span><span class="cx" style="display: block; padding: 0 10px">                smilies_init();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $exp_str, convert_smilies( $in_str ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // standard smilies, use_smilies: OFF

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Standard smilies, use_smilies: OFF.

</ins><span class="cx" style="display: block; padding: 0 10px">                 update_option( 'use_smilies', 0 );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -201,13 +201,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @dataProvider get_smilies_combinations

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_smilies_combinations( $in_txt, $converted_txt ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // custom smilies, use_smilies: ON

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Custom smilies, use_smilies: ON.

</ins><span class="cx" style="display: block; padding: 0 10px">                 update_option( 'use_smilies', 1 );

</span><span class="cx" style="display: block; padding: 0 10px">                smilies_init();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $converted_txt, convert_smilies( $in_txt ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // custom smilies, use_smilies: OFF

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Custom smilies, use_smilies: OFF.

</ins><span class="cx" style="display: block; padding: 0 10px">                 update_option( 'use_smilies', 0 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $in_txt, convert_smilies( $in_txt ) );

</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">        public function test_single_smilies_in_wpsmiliestrans( $in_txt, $converted_txt ) {

</span><span class="cx" style="display: block; padding: 0 10px">                global $wpsmiliestrans;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // standard smilies, use_smilies: ON

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Standard smilies, use_smilies: ON.

</ins><span class="cx" style="display: block; padding: 0 10px">                 update_option( 'use_smilies', 1 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! isset( $wpsmiliestrans ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -252,7 +252,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        smilies_init();

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $orig_trans = $wpsmiliestrans; // save original tranlations array

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $orig_trans = $wpsmiliestrans; // Save original tranlations array.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $wpsmiliestrans = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        ':)' => 'simple-smile.png',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -262,12 +262,12 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $converted_txt, convert_smilies( $in_txt ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // standard smilies, use_smilies: OFF

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Standard smilies, use_smilies: OFF.

</ins><span class="cx" style="display: block; padding: 0 10px">                 update_option( 'use_smilies', 0 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $in_txt, convert_smilies( $in_txt ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $wpsmiliestrans = $orig_trans; // reset original translations array

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $wpsmiliestrans = $orig_trans; // Reset original translations array.

</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 get_spaces_around_smilies() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -300,7 +300,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @dataProvider get_spaces_around_smilies

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_spaces_around_smilies( $in_txt, $converted_txt ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // standard smilies, use_smilies: ON

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Standard smilies, use_smilies: ON.

</ins><span class="cx" style="display: block; padding: 0 10px">                 update_option( 'use_smilies', 1 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                smilies_init();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -307,7 +307,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $converted_txt, convert_smilies( $in_txt ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // standard smilies, use_smilies: OFF

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Standard smilies, use_smilies: OFF.

</ins><span class="cx" style="display: block; padding: 0 10px">                 update_option( 'use_smilies', 0 );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunktestsphpunittestsformattingStripSlashesDeepphp"></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/formatting/StripSlashesDeep.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/StripSlashesDeep.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/formatting/StripSlashesDeep.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,9 +19,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'c' => 4,

</span><span class="cx" style="display: block; padding: 0 10px">                        'd' => 'foo',

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $arr['e'] = $arr; // Add a sub-array

-               $this->assertEquals( $arr, stripslashes_deep( $arr ) ); // Keyed array

-               $this->assertEquals( array_values( $arr ), stripslashes_deep( array_values( $arr ) ) ); // Non-keyed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $arr['e'] = $arr; // Add a sub-array.

+               $this->assertEquals( $arr, stripslashes_deep( $arr ) ); // Keyed array.

+               $this->assertEquals( array_values( $arr ), stripslashes_deep( array_values( $arr ) ) ); // Non-keyed.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $obj = new stdClass;

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $arr as $k => $v ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,8 +35,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $new = "I can't see, isn't that it?";

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $new, stripslashes_deep( $old ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $new, stripslashes_deep( "I can\\'t see, isn\\'t that it?" ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( array( 'a' => $new ), stripslashes_deep( array( 'a' => $old ) ) ); // Keyed array

-               $this->assertEquals( array( $new ), stripslashes_deep( array( $old ) ) ); // Non-keyed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertEquals( array( 'a' => $new ), stripslashes_deep( array( 'a' => $old ) ) ); // Keyed array.

+               $this->assertEquals( array( $new ), stripslashes_deep( array( $old ) ) ); // Non-keyed.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $obj_old    = new stdClass;

</span><span class="cx" style="display: block; padding: 0 10px">                $obj_old->a = $old;

</span></span></pre></div>

<a id="trunktestsphpunittestsformattingURLShortenphp"></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/formatting/URLShorten.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/URLShorten.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/formatting/URLShorten.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,17 +6,18 @@

</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Formatting_URLShorten extends WP_UnitTestCase {

</span><span class="cx" style="display: block; padding: 0 10px">        function test_shorten_url() {

</span><span class="cx" style="display: block; padding: 0 10px">                $tests = array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'wordpress\.org/about/philosophy'            => 'wordpress\.org/about/philosophy', // no longer strips slashes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'wordpress\.org/about/philosophy'            => 'wordpress\.org/about/philosophy', // No longer strips slashes.

</ins><span class="cx" style="display: block; padding: 0 10px">                         'wordpress.org/about/philosophy'             => 'wordpress.org/about/philosophy',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'http://wordpress.org/about/philosophy/'     => 'wordpress.org/about/philosophy', // remove http, trailing slash

-                       'http://www.wordpress.org/about/philosophy/' => 'wordpress.org/about/philosophy', // remove http, www

-                       'http://wordpress.org/about/philosophy/#box' => 'wordpress.org/about/philosophy/#box', // don't shorten 35 characters

-                       'http://wordpress.org/about/philosophy/#decisions' => 'wordpress.org/about/philosophy/#&hellip;', // shorten to 32 if > 35 after cleaning

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'http://wordpress.org/about/philosophy/'     => 'wordpress.org/about/philosophy',  // Remove http, trailing slash.

+                       'http://www.wordpress.org/about/philosophy/' => 'wordpress.org/about/philosophy',  // Remove http, www.

+                       'http://wordpress.org/about/philosophy/#box' => 'wordpress.org/about/philosophy/#box',            // Don't shorten 35 characters.

+                       'http://wordpress.org/about/philosophy/#decisions' => 'wordpress.org/about/philosophy/#&hellip;', // Shorten to 32 if > 35 after cleaning.

</ins><span class="cx" style="display: block; padding: 0 10px">                 );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $tests as $k => $v ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $v, url_shorten( $k ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</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->assertEquals( 'wordpress.org/about/philosophy/#&hellip;', url_shorten( 'http://wordpress.org/about/philosophy/#decisions' ), 31 ); // shorten to 31 if > 34 after cleaning

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Shorten to 31 if > 34 after cleaning.

+               $this->assertEquals( 'wordpress.org/about/philosophy/#&hellip;', url_shorten( 'http://wordpress.org/about/philosophy/#decisions' ), 31 );

</ins><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="trunktestsphpunittestsformattingUtf8UriEncodephp"></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/formatting/Utf8UriEncode.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/Utf8UriEncode.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/formatting/Utf8UriEncode.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,7 +6,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Formatting_Utf8UriEncode extends WP_UnitTestCase {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Non-ASCII UTF-8 characters should be percent encoded. Spaces etc.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Non-ASCII UTF-8 characters should be percent-encoded. Spaces etc.

</ins><span class="cx" style="display: block; padding: 0 10px">          * are dealt with elsewhere.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @dataProvider data

</span></span></pre></div>

<a id="trunktestsphpunittestsformattingWPSpecialcharsphp"></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/formatting/WPSpecialchars.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/WPSpecialchars.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/formatting/WPSpecialchars.php     2020-01-29 00:43:23 UTC (rev 47122)

</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">        function test_allowed_entity_names() {

</span><span class="cx" style="display: block; padding: 0 10px">                global $allowedentitynames;

</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 entities should be unchanged

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Allowed entities should be unchanged.

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $allowedentitynames as $ent ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( 'apos' === $ent ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                // But for some reason, PHP doesn't allow &apos;

</span></span></pre></div>

<a id="trunktestsphpunittestsformattingWPStripAllTagsphp"></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/formatting/WPStripAllTags.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/WPStripAllTags.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/formatting/WPStripAllTags.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,11 +14,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $text = "lorem<br />\nipsum";

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( "lorem\nipsum", wp_strip_all_tags( $text ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // test removing breaks is working

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test removing breaks is working.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $text = 'lorem<br />ipsum';

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'loremipsum', wp_strip_all_tags( $text, 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">-                // test script / style tag's contents is removed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test script / style tag's contents is removed.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $text = 'lorem<script>alert(document.cookie)</script>ipsum';

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'loremipsum', wp_strip_all_tags( $text ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</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">                $text = "lorem<style>* { display: 'none' }</style>ipsum";

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'loremipsum', wp_strip_all_tags( $text ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // test "marlformed" markup of contents

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test "marlformed" markup of contents.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $text = "lorem<style>* { display: 'none' }<script>alert( document.cookie )</script></style>ipsum";

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'loremipsum', wp_strip_all_tags( $text ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span></span></pre></div>

<a id="trunktestsphpunittestsformattingWPTargetedLinkRelphp"></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/formatting/WPTargetedLinkRel.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/WPTargetedLinkRel.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/formatting/WPTargetedLinkRel.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -69,7 +69,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Ensure empty rel attributes are not added.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @ticket 45352.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @ticket 45352

</ins><span class="cx" style="display: block; padding: 0 10px">          */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_ignore_if_wp_targeted_link_rel_nulled() {

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'wp_targeted_link_rel', '__return_empty_string' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,7 +81,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Ensure default content filters are added.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @ticket 45292.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @ticket 45292

</ins><span class="cx" style="display: block; padding: 0 10px">          */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_wp_targeted_link_rel_filters_run() {

</span><span class="cx" style="display: block; padding: 0 10px">                $content  = '<p>Links: <a href="/" target="_blank">No rel</a></p>';

</span></span></pre></div>

<a id="trunktestsphpunittestsformattingWPTexturizephp"></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/formatting/WPTexturize.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/WPTexturize.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/formatting/WPTexturize.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,7 +32,9 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        //WP Ticket #1418

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**

+        * @ticket 1418

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_bracketed_quotes_1418() {

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( '(&#8220;test&#8221;)', wptexturize( '("test")' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( '(&#8216;test&#8217;)', wptexturize( "('test')" ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,12 +41,16 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( '(&#8217;twas)', wptexturize( "('twas)" ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        //WP Ticket #3810

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**

+        * @ticket 3810

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_bracketed_quotes_3810() {

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'A dog (&#8220;Hubertus&#8221;) was sent out.', wptexturize( 'A dog ("Hubertus") was sent out.' ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        //WP Ticket #4539

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**

+        * @ticket 4539

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_basic_quotes() {

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'test&#8217;s', wptexturize( 'test\'s' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,16 +86,16 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_quotes() {

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( '&#8220;Quoted String&#8221;', wptexturize( '"Quoted String"' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //$this->assertEquals('Here is &#8220;<a href="http://example.com">a test with a link</a>&#8221;', wptexturize('Here is "<a href="http://example.com">a test with a link</a>"'));

-               //$this->assertEquals('Here is &#8220;<a href="http://example.com">a test with a link and a period</a>&#8221;.', wptexturize('Here is "<a href="http://example.com">a test with a link and a period</a>".'));

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // $this->assertEquals( 'Here is &#8220;<a href="http://example.com">a test with a link</a>&#8221;', wptexturize( 'Here is "<a href="http://example.com">a test with a link</a>"' ) );

+               // $this->assertEquals( 'Here is &#8220;<a href="http://example.com">a test with a link and a period</a>&#8221;.', wptexturize( 'Here is "<a href="http://example.com">a test with a link and a period</a>".' ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 'Here is &#8220;<a href="http://example.com">a test with a link</a>&#8221; and a space.', wptexturize( 'Here is "<a href="http://example.com">a test with a link</a>" and a space.' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'Here is &#8220;<a href="http://example.com">a test with a link</a> and some text quoted&#8221;', wptexturize( 'Here is "<a href="http://example.com">a test with a link</a> and some text quoted"' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //$this->assertEquals('Here is &#8220;<a href="http://example.com">a test with a link</a>&#8221;, and a comma.', wptexturize('Here is "<a href="http://example.com">a test with a link</a>", and a comma.'));

-               //$this->assertEquals('Here is &#8220;<a href="http://example.com">a test with a link</a>&#8221;; and a semi-colon.', wptexturize('Here is "<a href="http://example.com">a test with a link</a>"; and a semi-colon.'));

-               //$this->assertEquals('Here is &#8220;<a href="http://example.com">a test with a link</a>&#8221;- and a dash.', wptexturize('Here is "<a href="http://example.com">a test with a link</a>"- and a dash.'));

-               //$this->assertEquals('Here is &#8220;<a href="http://example.com">a test with a link</a>&#8221;&#8230; and ellipses.', wptexturize('Here is "<a href="http://example.com">a test with a link</a>"... and ellipses.'));

-               //$this->assertEquals('Here is &#8220;a test <a href="http://example.com">with a link</a>&#8221;.', wptexturize('Here is "a test <a href="http://example.com">with a link</a>".'));

-               //$this->assertEquals('Here is &#8220;<a href="http://example.com">a test with a link</a>&#8221;and a work stuck to the end.', wptexturize('Here is "<a href="http://example.com">a test with a link</a>"and a work stuck to the end.'));

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // $this->assertEquals( 'Here is &#8220;<a href="http://example.com">a test with a link</a>&#8221;, and a comma.', wptexturize( 'Here is "<a href="http://example.com">a test with a link</a>", and a comma.' ) );

+               // $this->assertEquals( 'Here is &#8220;<a href="http://example.com">a test with a link</a>&#8221;; and a semi-colon.', wptexturize( 'Here is "<a href="http://example.com">a test with a link</a>"; and a semi-colon.' ) );

+               // $this->assertEquals( 'Here is &#8220;<a href="http://example.com">a test with a link</a>&#8221;- and a dash.', wptexturize( 'Here is "<a href="http://example.com">a test with a link</a>"- and a dash.' ) );

+               // $this->assertEquals( 'Here is &#8220;<a href="http://example.com">a test with a link</a>&#8221;&#8230; and ellipses.', wptexturize( 'Here is "<a href="http://example.com">a test with a link</a>"... and ellipses.' ) );

+               // $this->assertEquals( 'Here is &#8220;a test <a href="http://example.com">with a link</a>&#8221;.', wptexturize( 'Here is "a test <a href="http://example.com">with a link</a>".' ) );

+               // $this->assertEquals( 'Here is &#8220;<a href="http://example.com">a test with a link</a>&#8221;and a work stuck to the end.', wptexturize( 'Here is "<a href="http://example.com">a test with a link</a>"and a work stuck to the end.' ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 'A test with a finishing number, &#8220;like 23&#8221;.', wptexturize( 'A test with a finishing number, "like 23".' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'A test with a number, &#8220;like 62&#8221;, is nice to have.', wptexturize( 'A test with a number, "like 62", is nice to have.' ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -131,7 +137,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( ' &#8220;Class of &#8217;99&#8221;;', wptexturize( " \"Class of '99\";" ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( ' &#8220;Class of &#8217;99&#8221;!', wptexturize( " \"Class of '99\"!" ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( ' &#8220;Class of &#8217;99&#8221;?', wptexturize( " \"Class of '99\"?" ) );

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '}&#8221;Class of &#8217;99&#8243;{', wptexturize( "}\"Class of '99\"{" ) ); // Not a quotation, may be between two other quotations.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Not a quotation, may be between two other quotations.

+               $this->assertEquals( '}&#8221;Class of &#8217;99&#8243;{', wptexturize( "}\"Class of '99\"{" ) );

</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">        function test_quotes_after_numbers() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -144,8 +151,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_other_html() {

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( '&#8216;<strong>', wptexturize( "'<strong>" ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //$this->assertEquals('&#8216;<strong>Quoted Text</strong>&#8217;,', wptexturize("'<strong>Quoted Text</strong>',"));

-               //$this->assertEquals('&#8220;<strong>Quoted Text</strong>&#8221;,', wptexturize('"<strong>Quoted Text</strong>",'));

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // $this->assertEquals( '&#8216;<strong>Quoted Text</strong>&#8217;,', wptexturize( "'<strong>Quoted Text</strong>'," ) );

+               // $this->assertEquals( '&#8220;<strong>Quoted Text</strong>&#8221;,', wptexturize( '"<strong>Quoted Text</strong>",' ) );

</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">        function test_x() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -188,7 +195,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_entity_quote_cuddling() {

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( '&nbsp;&#8220;Testing&#8221;', wptexturize( '&nbsp;"Testing"' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //$this->assertEquals('&#38;&#8220;Testing&#8221;', wptexturize('&#38;"Testing"'));

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // $this->assertEquals( '&#38;&#8220;Testing&#8221;', wptexturize( '&#38;"Testing"' ) );

</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">@@ -341,7 +348,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'word &#8217;99&#8217;s word',

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</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">-                                "according to our source, '33 students scored less than 50' on the test.", // Apostrophes and primes have priority over quotes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "according to our source, '33 students scored less than 50' on the test.", // Apostrophes and primes have priority over quotes.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'according to our source, &#8217;33 students scored less than 50&#8242; on the test.',

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -374,7 +381,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'word [&#8216;word word',

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</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">-                                "word <'word word", // Invalid HTML

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "word <'word word",    // Invalid HTML.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 "word <'word word",

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -387,7 +394,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                "word \"'word word",

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                'word &#8220;&#8216;word word', // Two opening quotes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         'word &#8220;&#8216;word word', // Two opening quotes.

</ins><span class="cx" style="display: block; padding: 0 10px">                         ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                "'word word",

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -415,7 +422,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                "word\"'word word",

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                'word&#8221;&#8216;word word', // Closing quote, then opening quote

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         'word&#8221;&#8216;word word', // Closing quote, then opening quote.

</ins><span class="cx" style="display: block; padding: 0 10px">                         ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                "word ' word word",

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -443,7 +450,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                "word \"' word word",

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                'word &#8220;&#8216; word word', // Two opening quotes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         'word &#8220;&#8216; word word', // Two opening quotes.

</ins><span class="cx" style="display: block; padding: 0 10px">                         ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                "' word word",

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -471,7 +478,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                "word\"' word word",

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                'word&#8221;&#8216; word word', // Closing quote, then opening quote

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         'word&#8221;&#8216; word word', // Closing quote, then opening quote.

</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">@@ -536,7 +543,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'word99&#8242; word',

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                "word99'word", // Not a prime anymore.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "word99'word",  // Not a prime anymore.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'word99&#8217;word',

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -610,7 +617,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'word [&#8220;word word',

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</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">-                                'word <"word word', // Invalid HTML

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         'word <"word word', // Invalid HTML.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'word <"word word',

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -691,11 +698,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'word word&#8221;} word',

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                'word word"> word', // Invalid HTML input?

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         'word word"> word',    // Invalid HTML input?

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'word word&#8221;> word',

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</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">-                                'word word"&gt; word', // Valid HTML should work

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         'word word"&gt; word', // Valid HTML should work.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'word word&#8221;&gt; word',

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -844,6 +851,7 @@

<span class="cx" style="display: block; padding: 0 10px">         * Checks all baseline patterns. If anything ever changes in wptexturize(), these tests may fail.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 22692

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * @ticket 30445

</ins><span class="cx" style="display: block; padding: 0 10px">          * @dataProvider data_multiplication

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_multiplication( $input, $output ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1291,15 +1299,15 @@

</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">                        array(

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                '[/gallery ...]', // This would actually be ignored by the shortcode system.  The decision to not texturize it is intentional, if not correct.

-                               '[/gallery ...]',

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         '[/gallery ...]', // This would actually be ignored by the shortcode system.

+                               '[/gallery ...]', // The decision to not texturize it is intentional, if not correct.

</ins><span class="cx" style="display: block; padding: 0 10px">                         ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                '[[gallery]]...[[/gallery]]', // Shortcode parsing will ignore the inner ]...[ part and treat this as a single escaped shortcode.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         '[[gallery]]...[[/gallery]]', // Shortcode parsing will ignore the inner ']...[' part and treat this as a single escaped shortcode.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '[[gallery]]&#8230;[[/gallery]]',

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                '[[[gallery]]]...[[[/gallery]]]', // Again, shortcode parsing matches, but only the [[gallery] and [/gallery]] parts.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         '[[[gallery]]]...[[[/gallery]]]', // Again, shortcode parsing matches, but only the '[[gallery]' and '[/gallery]]' parts.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '[[[gallery]]]&#8230;[[[/gallery]]]',

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1307,8 +1315,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                '[gallery &#8230;',

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                '[gallery <br ... /> ...]', // This tag is still valid. Shortcode 'attributes' are not considered in the initial parsing of shortcodes, and HTML is allowed.

-                               '[gallery <br ... /> ...]',

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         '[gallery <br ... /> ...]', // This tag is still valid. Shortcode 'attributes' are not considered

+                               '[gallery <br ... /> ...]', // in the initial parsing of shortcodes, and HTML is allowed.

</ins><span class="cx" style="display: block; padding: 0 10px">                         ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                '<br [gallery ...] ... />',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1347,7 +1355,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">                        array(

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                '[[gallery <br ... /> ...]]', // This gets parsed as an escaped shortcode with embedded HTML.  Brains may explode.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         '[[gallery <br ... /> ...]]', // This gets parsed as an escaped shortcode with embedded HTML. Brains may explode.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '[[gallery <br ... /> ...]]',

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1443,7 +1451,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                '[ but also catches the <b>styled &#8220;[quote]&#8221; here</b> ]',

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                '[Let\'s get crazy<input>[caption code="<a href=\'?a[]=100\'>hello</a>"]</input>world]', // caption shortcode is invalid here because it contains [] chars.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         '[Let\'s get crazy<input>[caption code="<a href=\'?a[]=100\'>hello</a>"]</input>world]', // [caption] shortcode is invalid here because it contains '[]' chars.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '[Let&#8217;s get crazy<input>[caption code=&#8221;<a href=\'?a[]=100\'>hello</a>&#8220;]</input>world]',

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1490,7 +1498,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'word &#8217;99; word',

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                "word '99' word", // For this pattern, prime doesn't make sense.  Should get apos and a closing quote.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "word '99' word", // For this pattern, prime doesn't make sense. Should get apos and a closing quote.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'word &#8217;99&#8217; word',

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1855,15 +1863,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                '[a]a&#8211;b[audio]---[/audio]a&#8211;b[/a]',

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                '[code ...]...[/code]', // code is not a registered shortcode.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         '[code ...]...[/code]',   // '[code]' is not a registered shortcode.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '[code &#8230;]&#8230;[/code]',

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                '[hello ...]...[/hello]', // hello is not a registered shortcode.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         '[hello ...]...[/hello]', // '[hello]' is not a registered shortcode.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '[hello &#8230;]&#8230;[/hello]',

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                '[...]...[/...]', // These are potentially usable shortcodes.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         '[...]...[/...]',         // These are potentially usable shortcodes.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '[&#8230;]&#8230;[/&#8230;]',

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1875,13 +1883,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                '[randomthing param=&#8221;test&#8221;]',

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                '[[audio]...[/audio]...', // These are potentially usable shortcodes.  Unfortunately, the meaning of [[audio] is ambiguous unless we run the entire shortcode regexp.

-                               '[[audio]&#8230;[/audio]&#8230;',

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         '[[audio]...[/audio]...',         // These are potentially usable shortcodes.

+                               '[[audio]&#8230;[/audio]&#8230;', // Unfortunately, the meaning of [[audio] is ambiguous unless we run the entire shortcode regexp.

</ins><span class="cx" style="display: block; padding: 0 10px">                         ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                '[audio]...[/audio]]...', // These are potentially usable shortcodes.  Unfortunately, the meaning of [/audio]] is ambiguous unless we run the entire shortcode regexp.

-                               '[audio]...[/audio]]...', // This test would not pass in 3.9 because the extra brace was always ignored by texturize.

-                       ),

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         '[audio]...[/audio]]...', // These are potentially usable shortcodes.

+                               '[audio]...[/audio]]...', // Unfortunately, the meaning of [/audio]] is ambiguous unless we run the entire shortcode regexp.

+                       ),                            // This test would not pass in 3.9 because the extra brace was always ignored by texturize.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                '<span>hello[/audio]---</span>',

</span><span class="cx" style="display: block; padding: 0 10px">                                '<span>hello[/audio]&#8212;</span>',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1934,7 +1942,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'The best year &#8220;was that time in 2012&#8221; when everyone partied, he said.',

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</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">-                                "I need 4 x 20' = 80' of trim.", // Works only with a space before the = char.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "I need 4 x 20' = 80' of trim.", // Works only with a space before the '=' char.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'I need 4 x 20&#8242; = 80&#8242; of trim.',

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2030,7 +2038,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'The best year !q2!was that time in 2012!q2! when everyone partied, he said.',

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</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">-                                "I need 4 x 20' = 80' of trim.", // Works only with a space before the = char.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "I need 4 x 20' = 80' of trim.", // Works only with a space before the '=' char.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'I need 4 x 20!prime1! = 80!prime1! of trim.',

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2077,12 +2085,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_pcre_performance( $input ) {

</span><span class="cx" style="display: block; padding: 0 10px">                global $shortcode_tags;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // With Shortcodes Disabled

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // With shortcodes disabled.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $regex  = _get_wptexturize_split_regex();

</span><span class="cx" style="display: block; padding: 0 10px">                $result = benchmark_pcre_backtracking( $regex, $input, 'split' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertLessThan( 200, $result );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // With Shortcodes Enabled

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // With shortcodes enabled.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $shortcode_regex = _get_wptexturize_shortcode_regex( array_keys( $shortcode_tags ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $regex           = _get_wptexturize_split_regex( $shortcode_regex );

</span><span class="cx" style="display: block; padding: 0 10px">                $result          = benchmark_pcre_backtracking( $regex, $input, 'split' );

</span></span></pre></div>

<a id="trunktestsphpunittestsformattingWPTrimWordsphp"></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/formatting/WPTrimWords.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/WPTrimWords.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/formatting/WPTrimWords.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,7 +35,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $trimmed, wp_trim_words( $text, 5 ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // #18726

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**

+        * @ticket 18726

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_strips_script_and_style_content() {

</span><span class="cx" style="display: block; padding: 0 10px">                $trimmed = 'This text contains. It should go.';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunktestsphpunittestsformattingbalanceTagsphp"></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/formatting/balanceTags.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/balanceTags.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/formatting/balanceTags.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,7 +80,7 @@

<span class="cx" style="display: block; padding: 0 10px">                        // Examples from the spec working document.

</span><span class="cx" style="display: block; padding: 0 10px">                        array( 'math-α' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( 'emotion-😍' ),

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // UNICODE ranges

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Unicode ranges.

</ins><span class="cx" style="display: block; padding: 0 10px">                         // 0x00b7

</span><span class="cx" style="display: block; padding: 0 10px">                        array( 'b-·' ),

<span class="cx" style="display: block; padding: 0 10px">                        // Latin characters with accents/modifiers.

</span></span></pre></div>

<a id="trunktestsphpunittestsformattingent2ncrphp"></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/formatting/ent2ncr.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/ent2ncr.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/formatting/ent2ncr.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,7 +21,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $entities      = file( DIR_TESTDATA . '/formatting/entities.txt' );

</span><span class="cx" style="display: block; padding: 0 10px">                $data_provided = array();

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $entities as $line ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // comment

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Comment.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $commentpos = strpos( $line, '###' );

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( false !== $commentpos ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $line = trim( substr( $line, 0, $commentpos ) );

</span></span></pre></div>

<a id="trunktestsphpunittestsfunctionsallowedProtocolsphp"></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/functions/allowedProtocols.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions/allowedProtocols.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/functions/allowedProtocols.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,26 +38,26 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function data_example_urls() {

</span><span class="cx" style="display: block; padding: 0 10px">                return array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        array( 'http', 'http://example.com' ), // RFC7230

-                       array( 'https', 'https://example.com' ), // RFC7230

-                       array( 'ftp', 'ftp://example.com' ), // RFC1738

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 array( 'http', 'http://example.com' ),                                 // RFC7230

+                       array( 'https', 'https://example.com' ),                               // RFC7230

+                       array( 'ftp', 'ftp://example.com' ),                                   // RFC1738

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( 'ftps', 'ftps://example.com' ),

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        array( 'mailto', 'mailto://someone@example.com' ), // RFC6068

-                       array( 'news', 'news://news.server.example/example.group.this' ), // RFC5538

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 array( 'mailto', 'mailto://someone@example.com' ),                     // RFC6068

+                       array( 'news', 'news://news.server.example/example.group.this' ),      // RFC5538

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( 'irc', 'irc://example.com/wordpress' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( 'gopher', 'gopher://example.com/7a_gopher_selector%09foobar' ), // RFC4266

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        array( 'nntp', 'nntp://news.server.example/example.group.this' ), // RFC5538

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 array( 'nntp', 'nntp://news.server.example/example.group.this' ),      // RFC5538

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( 'feed', 'feed://example.com/rss.xml' ),

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        array( 'telnet', 'telnet://user:password@example.com:80/' ), // RFC4248

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 array( 'telnet', 'telnet://user:password@example.com:80/' ),           // RFC4248

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( 'mms', 'mms://example.com:80/path' ),

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        array( 'rtsp', 'rtsp://media.example.com:554/wordpress/audiotrack' ), // RFC2326

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 array( 'rtsp', 'rtsp://media.example.com:554/wordpress/audiotrack' ),  // RFC2326

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( 'svn', 'svn://core.svn.wordpress.org/' ),

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        array( 'tel', 'tel:+1-234-567-8910' ), // RFC3966

-                       array( 'sms', 'sms:+1-234-567-8910' ), // RFC3966

-                       array( 'fax', 'fax:+123.456.78910' ), // RFC2806/RFC3966

-                       array( 'xmpp', 'xmpp://guest@example.com' ), // RFC5122

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 array( 'tel', 'tel:+1-234-567-8910' ),                                 // RFC3966

+                       array( 'sms', 'sms:+1-234-567-8910' ),                                 // RFC3966

+                       array( 'fax', 'fax:+123.456.78910' ),                                  // RFC2806/RFC3966

+                       array( 'xmpp', 'xmpp://guest@example.com' ),                           // RFC5122

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( 'webcal', 'webcal://example.com/calendar.ics' ),

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        array( 'urn', 'urn:uuid:6e8bc430-9c3a-11d9-9669-0800200c9a66' ), // RFC2141

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 array( 'urn', 'urn:uuid:6e8bc430-9c3a-11d9-9669-0800200c9a66' ),       // RFC2141

</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="trunktestsphpunittestsfunctionsdeprecatedphp"></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/functions/deprecated.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions/deprecated.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/functions/deprecated.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -153,7 +153,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->fail( 'jpeg support unavailable' );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Call wp_save_image_file

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Call wp_save_image_file().

</ins><span class="cx" style="display: block; padding: 0 10px">                 include_once( ABSPATH . 'wp-admin/includes/image-edit.php' );

</span><span class="cx" style="display: block; padding: 0 10px">                $file = wp_tempnam();

</span><span class="cx" style="display: block; padding: 0 10px">                $img  = imagecreatefromjpeg( DIR_TESTDATA . '/images/canola.jpg' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -161,7 +161,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                imagedestroy( $img );

</span><span class="cx" style="display: block; padding: 0 10px">                unlink( $file );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check if the arg was deprecated

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check if the arg was deprecated.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $check = $this->was_deprecated( 'argument', 'wp_save_image_file' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEmpty( $check );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -176,7 +176,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->fail( 'jpeg support unavailable' );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Call wp_save_image_file

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Call wp_save_image_file().

</ins><span class="cx" style="display: block; padding: 0 10px">                 include_once( ABSPATH . 'wp-admin/includes/image-edit.php' );

</span><span class="cx" style="display: block; padding: 0 10px">                $file = wp_tempnam();

</span><span class="cx" style="display: block; padding: 0 10px">                $img  = wp_get_image_editor( DIR_TESTDATA . '/images/canola.jpg' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -184,7 +184,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                unset( $img );

</span><span class="cx" style="display: block; padding: 0 10px">                unlink( $file );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check if the arg was deprecated

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check if the arg was deprecated.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $check = $this->was_deprecated( 'argument', 'wp_save_image_file' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $check );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span></span></pre></div>

<a id="trunktestsphpunittestsfunctionswpAuthCheckphp"></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/functions/wpAuthCheck.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions/wpAuthCheck.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/functions/wpAuthCheck.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,7 +27,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 41860

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wp_auth_check_user_logged_in() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // log user in

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Log user in.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_set_current_user( 1 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,7 +44,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 41860

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wp_auth_check_user_logged_in_login_grace_period_set() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // log user in

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Log user in.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_set_current_user( 1 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $GLOBALS['login_grace_period'] = 1;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -55,7 +55,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $actual    = wp_auth_check( array() );

</span><span class="cx" style="display: block; padding: 0 10px">                $logged_in = is_user_logged_in();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Leave the global state unchanged

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Leave the global state unchanged.

</ins><span class="cx" style="display: block; padding: 0 10px">                 unset( $GLOBALS['login_grace_period'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $logged_in );

</span></span></pre></div>

<a id="trunktestsphpunittestsfunctionsphp"></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/functions.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/functions.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,7 +22,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wp_parse_args_array() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // arrays

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Arrays.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $a = array();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array(), wp_parse_args( $a ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $b = array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -140,22 +140,22 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px">        function data_wp_normalize_path() {

</span><span class="cx" style="display: block; padding: 0 10px">                return array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Windows paths

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Windows paths.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( 'C:\\www\\path\\', 'C:/www/path/' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( 'C:\\www\\\\path\\', 'C:/www/path/' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( 'c:/www/path', 'C:/www/path' ),

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        array( 'c:\\www\\path\\', 'C:/www/path/' ), // uppercase drive letter

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 array( 'c:\\www\\path\\', 'C:/www/path/' ), // Uppercase drive letter.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( 'c:\\\\www\\path\\', 'C:/www/path/' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '\\\\Domain\\DFSRoots\\share\\path\\', '//Domain/DFSRoots/share/path/' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '\\\\Server\\share\\path', '//Server/share/path' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '\\\\Server\\share', '//Server/share' ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Linux paths

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Linux paths.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( '/www/path/', '/www/path/' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '/www/path/////', '/www/path/' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '/www/path', '/www/path' ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // PHP Stream wrappers

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // PHP stream wrappers.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( 'php://input', 'php://input' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( 'http://example.com//path.ext', 'http://example.com/path.ext' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( 'file://c:\\www\\path\\', 'file://C:/www/path/' ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -166,30 +166,30 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $testdir = DIR_TESTDATA . '/images/';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // sanity check

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Sanity check.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 'abcdefg.png', wp_unique_filename( $testdir, 'abcdefg.png' ), 'Sanitiy check failed' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // check number is appended for file already exists

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check number is appended for file already exists.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFileExists( $testdir . 'test-image.png', 'Test image does not exist' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'test-image-1.png', wp_unique_filename( $testdir, 'test-image.png' ), 'Number not appended correctly' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFileNotExists( $testdir . 'test-image-1.png' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // check special chars

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check special chars.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 'testtést-imagé.png', wp_unique_filename( $testdir, 'testtést-imagé.png' ), 'Filename with special chars failed' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // check special chars with potential conflicting name

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check special chars with potential conflicting name.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 'tést-imagé.png', wp_unique_filename( $testdir, 'tést-imagé.png' ), 'Filename with special chars failed' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // check with single quotes in name (somehow)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check with single quotes in name (somehow).

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 'abcdefgh.png', wp_unique_filename( $testdir, "abcdefg'h.png" ), 'File with quote failed' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // check with single quotes in name (somehow)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check with double quotes in name (somehow).

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 'abcdefgh.png', wp_unique_filename( $testdir, 'abcdefg"h.png' ), 'File with quote failed' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // test crazy name (useful for regression tests)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test crazy name (useful for regression tests).

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( '12af34567890@..^_qwerty-fghjkl-zx.png', wp_unique_filename( $testdir, '12%af34567890#~!@#$..%^&*()|_+qwerty  fgh`jkl zx<>?:"{}[]="\'/?.png' ), 'Failed crazy file name' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // test slashes in names

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test slashes in names.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 'abcdefg.png', wp_unique_filename( $testdir, 'abcde\fg.png' ), 'Slash not removed' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'abcdefg.png', wp_unique_filename( $testdir, 'abcde\\fg.png' ), 'Double slashed not removed' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'abcdefg.png', wp_unique_filename( $testdir, 'abcde\\\fg.png' ), 'Tripple slashed not removed' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -525,7 +525,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'array', $mimes );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEmpty( $mimes );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // upload_mimes shouldn't affect wp_get_mime_types()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // 'upload_mimes' should not affect wp_get_mime_types().

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_filter( 'upload_mimes', '__return_empty_array' );

</span><span class="cx" style="display: block; padding: 0 10px">                $mimes = wp_get_mime_types();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'array', $mimes );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -646,47 +646,47 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function data_device_can_upload() {

</span><span class="cx" style="display: block; padding: 0 10px">                return array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // iPhone iOS 5.0.1, Safari 5.1

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // iPhone iOS 5.0.1, Safari 5.1.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'Mozilla/5.0 (iPhone; CPU iPhone OS 5_0_1 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Mobile/9A406)',

</span><span class="cx" style="display: block; padding: 0 10px">                                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">-                        // iPad iOS 3.2, Safari 4.0.4

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // iPad iOS 3.2, Safari 4.0.4.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'Mozilla/5.0 (iPad; U; CPU OS 3_2 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B334b Safari/531.21.10',

</span><span class="cx" style="display: block; padding: 0 10px">                                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">-                        // iPod iOS 4.3.3, Safari 5.0.2

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // iPod iOS 4.3.3, Safari 5.0.2.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'Mozilla/5.0 (iPod; U; CPU iPhone OS 4_3_3 like Mac OS X; ja-jp) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8J2 Safari/6533.18.5',

</span><span class="cx" style="display: block; padding: 0 10px">                                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">-                        // iPhone iOS 6.0.0, Safari 6.0

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // iPhone iOS 6.0.0, Safari 6.0.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'Mozilla/5.0 (iPhone; CPU iPhone OS 6_0 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10A5376e Safari/8536.25',

</span><span class="cx" style="display: block; padding: 0 10px">                                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">-                        // iPad iOS 6.0.0, Safari 6.0

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // iPad iOS 6.0.0, Safari 6.0.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'Mozilla/5.0 (iPad; CPU OS 6_0 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10A5376e Safari/8536.25',

</span><span class="cx" style="display: block; padding: 0 10px">                                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">-                        // Android 2.2, Android Webkit Browser

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Android 2.2, Android Webkit Browser.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'Mozilla/5.0 (Android 2.2; Windows; U; Windows NT 6.1; en-US) AppleWebKit/533.19.4 (KHTML, like Gecko) Version/5.0.3 Safari/533.19.4',

</span><span class="cx" style="display: block; padding: 0 10px">                                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">-                        // BlackBerry 9900, BlackBerry browser

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // BlackBerry 9900, BlackBerry browser.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'Mozilla/5.0 (BlackBerry; U; BlackBerry 9900; en) AppleWebKit/534.11+ (KHTML, like Gecko) Version/7.1.0.346 Mobile Safari/534.11+',

</span><span class="cx" style="display: block; padding: 0 10px">                                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">-                        // Windows Phone 8.0, Internet Explorer 10.0;

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Windows Phone 8.0, Internet Explorer 10.0.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'Mozilla/5.0 (compatible; MSIE 10.0; Windows Phone 8.0; Trident/6.0; IEMobile/10.0; ARM; Touch; NOKIA; Lumia 920)',

</span><span class="cx" style="display: block; padding: 0 10px">                                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">-                        // Ubuntu desktop, Firefox 41.0

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Ubuntu desktop, Firefox 41.0.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:41.0) Gecko/20100101 Firefox/41.0',

</span><span class="cx" style="display: block; padding: 0 10px">                                true,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -716,10 +716,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'http://българия.icom.museum',

</span><span class="cx" style="display: block; padding: 0 10px">                        'http://تشادر.icom.museum',

</span><span class="cx" style="display: block; padding: 0 10px">                        'http://中国.icom.museum',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        #'http://القمر.icom.museum', // Comoros    http://القمر.icom.museum

-                       #'http://κυπρος.icom.museum', Cyprus      http://κυπρος.icom.museum

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // 'http://القمر.icom.museum',         // Comoros http://القمر.icom.museum

+                       // 'http://κυπρος.icom.museum',        // Cyprus  http://κυπρος.icom.museum

</ins><span class="cx" style="display: block; padding: 0 10px">                         'http://českárepublika.icom.museum',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        #'http://مصر.icom.museum', // Egypt  http://مصر.icom.museum

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // 'http://مصر.icom.museum',           // Egypt   http://مصر.icom.museum

</ins><span class="cx" style="display: block; padding: 0 10px">                         'http://ελλάδα.icom.museum',

</span><span class="cx" style="display: block; padding: 0 10px">                        'http://magyarország.icom.museum',

</span><span class="cx" style="display: block; padding: 0 10px">                        'http://ísland.icom.museum',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -735,12 +735,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'http://ລາວ.icom.museum',

</span><span class="cx" style="display: block; padding: 0 10px">                        'http://لبنان.icom.museum',

</span><span class="cx" style="display: block; padding: 0 10px">                        'http://македонија.icom.museum',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        #'http://موريتانيا.icom.museum', // Mauritania http://موريتانيا.icom.museum

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // 'http://موريتانيا.icom.museum',     // Mauritania http://موريتانيا.icom.museum

</ins><span class="cx" style="display: block; padding: 0 10px">                         'http://méxico.icom.museum',

</span><span class="cx" style="display: block; padding: 0 10px">                        'http://монголулс.icom.museum',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        #'http://المغرب.icom.museum', // Morocco  http://المغرب.icom.museum

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // 'http://المغرب.icom.museum',        // Morocco    http://المغرب.icom.museum

</ins><span class="cx" style="display: block; padding: 0 10px">                         'http://नेपाल.icom.museum',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        #'http://عمان.icom.museum', // Oman http://عمان.icom.museum

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // 'http://عمان.icom.museum',          // Oman       http://عمان.icom.museum

</ins><span class="cx" style="display: block; padding: 0 10px">                         'http://قطر.icom.museum',

</span><span class="cx" style="display: block; padding: 0 10px">                        'http://românia.icom.museum',

</span><span class="cx" style="display: block; padding: 0 10px">                        'http://россия.иком.museum',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -826,7 +826,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $original_urls, $urls );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $exploded = array_values( array_filter( array_map( 'trim', explode( "\n", $blob ) ) ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // wp_extract_urls calls html_entity_decode

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // wp_extract_urls() calls html_entity_decode().

</ins><span class="cx" style="display: block; padding: 0 10px">                 $decoded = array_map( 'html_entity_decode', $exploded );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $decoded, $urls );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1664,17 +1664,17 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        array( 1, false ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '00', false ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '30:-10', false ),

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        array( ':30:00', false ), // Missing HH.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 array( ':30:00', false ),   // Missing HH.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( 'MM:30:00', false ), // Invalid HH.

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '30:MM:00', false ), // Invalid ii.

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '30:30:MM', false ), // Invalid ss.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        array( '30:MM', false ), // Invalid ss.

-                       array( 'MM:00', false ), // Invalid ii.

-                       array( 'MM:MM', false ), // Invalid ii and ss.

-                       array( '10 :30', false ), // Containing a space.

-                       array( '59:61', false ), // Out of bound.

-                       array( '61:59', false ), // Out of bound.

-                       array( '3:59:61', false ), // Out of bound.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 array( '30:MM', false ),    // Invalid ss.

+                       array( 'MM:00', false ),    // Invalid ii.

+                       array( 'MM:MM', false ),    // Invalid ii and ss.

+                       array( '10 :30', false ),   // Containing a space.

+                       array( '59:61', false ),    // Out of bound.

+                       array( '61:59', false ),    // Out of bound.

+                       array( '3:59:61', false ),  // Out of bound.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( '03:61:59', false ), // Out of bound.

</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="trunktestsphpunittestsgeneralpaginateLinksphp"></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/general/paginateLinks.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/general/paginateLinks.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/general/paginateLinks.php 2020-01-29 00:43:23 UTC (rev 47122)

</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">        function test_paginate_links_base_value() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Current page: 2

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Current page: 2.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $links = paginate_links(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'current'  => 2,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -159,7 +159,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $document                     = new DOMDocument();

</span><span class="cx" style="display: block; padding: 0 10px">                $document->preserveWhiteSpace = 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">-                // The first two links should link to page 1

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // The first two links should link to page 1.

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $expected_attributes as $link_idx => $attributes ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $document->loadHTML( $links[ $link_idx ] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -174,7 +174,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $attributes['class'], $class );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Current page: 1

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Current page: 1.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $links = paginate_links(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'current'  => 1,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -340,7 +340,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 31939

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_custom_base_query_arg_should_be_stripped_from_current_url_before_generating_pag_links() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Fake the current URL: example.com?foo

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Fake the current URL: example.com?foo.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $request_uri            = $_SERVER['REQUEST_URI'];

</span><span class="cx" style="display: block; padding: 0 10px">                $_SERVER['REQUEST_URI'] = add_query_arg( 'foo', '', $request_uri );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunktestsphpunittestsgeneraltemplatephp"></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/general/template.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/general/template.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/general/template.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -234,7 +234,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $upload              = wp_upload_bits( wp_basename( $filename ), null, $contents );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->site_icon_url = $upload['url'];

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Save the data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Save the data.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->site_icon_id = $this->_make_attachment( $upload );

</span><span class="cx" style="display: block; padding: 0 10px">                return $this->site_icon_id;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -445,7 +445,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @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 test_get_the_modified_time_failures_are_filtered() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Remove global post objet

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Remove global post object.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $GLOBALS['post'] = null;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = 'filtered modified time failure result';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -516,7 +516,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @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 test_get_the_modified_date_failures_are_filtered() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Remove global post objet

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Remove global post object.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $GLOBALS['post'] = null;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = 'filtered modified date failure result';

</span></span></pre></div>

<a id="trunktestsphpunittestshttpbasephp"></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/http/base.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/http/base.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/http/base.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,9 +32,9 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Disable all transports aside from this one.

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( array( 'curl', 'streams', 'fsockopen' ) as $t ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        remove_filter( "use_{$t}_transport", '__return_false' ); // Just strip them all

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 remove_filter( "use_{$t}_transport", '__return_false' );  // Just strip them all...

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( $t !== $this->transport ) {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                add_filter( "use_{$t}_transport", '__return_false' ); // and add it back if need be..

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         add_filter( "use_{$t}_transport", '__return_false' ); // ...and add it back if need be.

</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">@@ -52,7 +52,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">        function test_redirect_on_301() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // 5 : 5 & 301

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // 5 : 5 & 301.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $res = wp_remote_request( $this->redirection_script . '?code=301&rt=' . 5, array( 'redirection' => 5 ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->skipTestOnTimeout( $res );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -61,7 +61,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_redirect_on_302() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // 5 : 5 & 302

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // 5 : 5 & 302.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $res = wp_remote_request( $this->redirection_script . '?code=302&rt=' . 5, array( 'redirection' => 5 ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->skipTestOnTimeout( $res );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,7 +73,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 16855

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_redirect_on_301_no_redirect() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // 5 > 0 & 301

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // 5 > 0 & 301.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $res = wp_remote_request( $this->redirection_script . '?code=301&rt=' . 5, array( 'redirection' => 0 ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->skipTestOnTimeout( $res );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -85,7 +85,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 16855

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_redirect_on_302_no_redirect() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // 5 > 0 & 302

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // 5 > 0 & 302.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $res = wp_remote_request( $this->redirection_script . '?code=302&rt=' . 5, array( 'redirection' => 0 ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->skipTestOnTimeout( $res );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,7 +94,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_redirections_equal() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // 5 - 5

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // 5 - 5.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $res = wp_remote_request( $this->redirection_script . '?rt=' . 5, array( 'redirection' => 5 ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->skipTestOnTimeout( $res );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -103,7 +103,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_no_head_redirections() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // No redirections on HEAD request:

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // No redirections on HEAD request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $res = wp_remote_request( $this->redirection_script . '?code=302&rt=' . 1, array( 'method' => 'HEAD' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->skipTestOnTimeout( $res );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,7 +115,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 16855

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_redirect_on_head() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Redirections on HEAD request when Requested

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Redirections on HEAD request when Requested.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $res = wp_remote_request(

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->redirection_script . '?rt=' . 5,

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -130,7 +130,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_redirections_greater() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // 10 > 5

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // 10 > 5.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $res = wp_remote_request( $this->redirection_script . '?rt=' . 10, array( 'redirection' => 5 ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->skipTestOnTimeout( $res );

</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">        function test_redirections_greater_edgecase() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // 6 > 5 (close edgecase)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // 6 > 5 (close edge case).

</ins><span class="cx" style="display: block; padding: 0 10px">                 $res = wp_remote_request( $this->redirection_script . '?rt=' . 6, array( 'redirection' => 5 ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->skipTestOnTimeout( $res );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -146,7 +146,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_redirections_less_edgecase() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // 4 < 5 (close edgecase)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // 4 < 5 (close edge case).

</ins><span class="cx" style="display: block; padding: 0 10px">                 $res = wp_remote_request( $this->redirection_script . '?rt=' . 4, array( 'redirection' => 5 ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->skipTestOnTimeout( $res );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -157,7 +157,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 16855

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_redirections_zero_redirections_specified() {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // 0 redirections asked for, Should return the document?

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // 0 redirections asked for, should return the document?

</ins><span class="cx" style="display: block; padding: 0 10px">                 $res = wp_remote_request( $this->redirection_script . '?code=302&rt=' . 5, array( 'redirection' => 0 ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->skipTestOnTimeout( $res );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -166,12 +166,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Do not redirect on non 3xx status codes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Do not redirect on non 3xx status codes.

</ins><span class="cx" style="display: block; padding: 0 10px">          *

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 16889

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_location_header_on_201() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Prints PASS on initial load, FAIL if the client follows the specified redirection

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Prints PASS on initial load, FAIL if the client follows the specified redirection.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $res = wp_remote_request( $this->redirection_script . '?201-location=true' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->skipTestOnTimeout( $res );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -180,7 +180,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">-         * Test handling of PUT requests on redirects

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Test handling of PUT requests on redirects.

</ins><span class="cx" style="display: block; padding: 0 10px">          *

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 16889

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -187,7 +187,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_no_redirection_on_PUT() {

</span><span class="cx" style="display: block; padding: 0 10px">                $url = 'http://api.wordpress.org/core/tests/1.0/redirection.php?201-location=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">-                // Test 301 - POST to POST

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test 301 - POST to POST.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $res = wp_remote_request(

</span><span class="cx" style="display: block; padding: 0 10px">                        $url,

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -205,7 +205,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 11888

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_send_headers() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test that the headers sent are received by the server

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test that the headers sent are received by the server.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $headers = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'test1' => 'test',

</span><span class="cx" style="display: block; padding: 0 10px">                        'test2' => 0,

</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">                $this->assertTrue( isset( $headers['test2'] ) && '0' === $headers['test2'] );

<span class="cx" style="display: block; padding: 0 10px">                // cURL/HTTP Extension Note: Will never pass, cURL does not pass headers with an empty value.

<span class="cx" style="display: block; padding: 0 10px">                // Should it be that empty headers with empty values are NOT sent?

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //$this->assertTrue( isset($headers['test3']) && '' === $headers['test3'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // $this->assertTrue( isset( $headers['test3'] ) && '' === $headers['test3'] );

</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">        function test_file_stream() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -242,7 +242,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'stream'  => true,

</span><span class="cx" style="display: block; padding: 0 10px">                                'timeout' => 30,

</span><span class="cx" style="display: block; padding: 0 10px">                        )

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                ); //Auto generate the filename.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         ); // Auto generate the filename.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Cleanup before we assert, as it'll return early.

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! is_wp_error( $res ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -253,9 +253,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->skipTestOnTimeout( $res );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotWPError( $res );

<span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( '', $res['body'] ); // The body should be empty.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $size, $res['headers']['content-length'] ); // Check the headers are returned (and the size is the same..)

-               $this->assertEquals( $size, $filesize ); // Check that the file is written to disk correctly without any extra characters

-               $this->assertStringStartsWith( get_temp_dir(), $res['filename'] ); // Check it's saving within the temp dir

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertEquals( $size, $res['headers']['content-length'] );   // Check the headers are returned (and the size is the same).

+               $this->assertEquals( $size, $filesize ); // Check that the file is written to disk correctly without any extra characters.

+               $this->assertStringStartsWith( get_temp_dir(), $res['filename'] ); // Check it's saving within the temp directory.

</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">@@ -271,7 +271,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'timeout'             => 30,

</span><span class="cx" style="display: block; padding: 0 10px">                                'limit_response_size' => $size,

</span><span class="cx" style="display: block; padding: 0 10px">                        )

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                ); //Auto generate the filename.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         ); // Auto generate the filename.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Cleanup before we assert, as it'll return early.

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! is_wp_error( $res ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -281,12 +281,12 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->skipTestOnTimeout( $res );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotWPError( $res );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $size, $filesize ); // Check that the file is written to disk correctly without any extra characters

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertEquals( $size, $filesize ); // Check that the file is written to disk correctly without any extra characters.

</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="cx" style="display: block; padding: 0 10px">        /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Tests Limiting the response size when returning strings

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Tests limiting the response size when returning strings.

</ins><span class="cx" style="display: block; padding: 0 10px">          *

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 31172

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -308,7 +308,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Test POST redirection methods

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Test POST redirection methods.

</ins><span class="cx" style="display: block; padding: 0 10px">          *

</span><span class="cx" style="display: block; padding: 0 10px">         * @dataProvider data_post_redirect_to_method_300

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -325,22 +325,22 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        public function data_post_redirect_to_method_300() {

</span><span class="cx" style="display: block; padding: 0 10px">                return array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Test 300 - POST to POST

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Test 300 - POST to POST.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                300,

</span><span class="cx" style="display: block; padding: 0 10px">                                '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">-                        // Test 301 - POST to POST

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Test 301 - POST to POST.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                301,

</span><span class="cx" style="display: block; padding: 0 10px">                                '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">-                        // Test 302 - POST to GET

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Test 302 - POST to GET.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                302,

</span><span class="cx" style="display: block; padding: 0 10px">                                'GET',

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Test 303 - POST to GET

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Test 303 - POST to GET.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                303,

</span><span class="cx" style="display: block; padding: 0 10px">                                'GET',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -349,7 +349,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Test HTTP Requests using an IP url, with a HOST header specified

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Test HTTP Requests using an IP URL, with a HOST header specified.

</ins><span class="cx" style="display: block; padding: 0 10px">          *

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 24182

</span><span class="cx" style="display: block; padding: 0 10px">         */

</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"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Test HTTP requests where SSL verification is disabled but the CA bundle is still populated

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Test HTTP requests where SSL verification is disabled but the CA bundle is still populated.

</ins><span class="cx" style="display: block; padding: 0 10px">          *

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 33978

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -394,7 +394,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">-         * Test HTTP Redirects with multiple Location headers specified

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Test HTTP Redirects with multiple Location headers specified.

</ins><span class="cx" style="display: block; padding: 0 10px">          *

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 16890

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -414,7 +414,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">-         * Test HTTP Cookie handling

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Test HTTP Cookie handling.

</ins><span class="cx" style="display: block; padding: 0 10px">          *

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 21182

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -428,7 +428,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Test if HTTPS support works

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Test if HTTPS support works.

</ins><span class="cx" style="display: block; padding: 0 10px">          *

</span><span class="cx" style="display: block; padding: 0 10px">         * @group ssl

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 25007

</span></span></pre></div>

<a id="trunktestsphpunittestshttpfunctionsphp"></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/http/functions.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/http/functions.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/http/functions.php        2020-01-29 00:43:23 UTC (rev 47122)

</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">        function test_head_request() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // this url give a direct 200 response

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // This URL gives a direct 200 response.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $url      = 'https://asdftestblog1.files.wordpress.com/2007/09/2007-06-30-dsc_4700-1.jpg';

</span><span class="cx" style="display: block; padding: 0 10px">                $response = wp_remote_head( $url );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,7 +31,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_head_redirect() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // this url will 301 redirect

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // This URL will 301 redirect.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $url      = 'https://asdftestblog1.wordpress.com/files/2007/09/2007-06-30-dsc_4700-1.jpg';

</span><span class="cx" style="display: block; padding: 0 10px">                $response = wp_remote_head( $url );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -58,7 +58,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'array', $response );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // should return the same headers as a head request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Should return the same headers as a HEAD request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 'image/jpeg', $headers['content-type'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( '40148', $headers['content-length'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( '200', wp_remote_retrieve_response_code( $response ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,7 +65,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_get_redirect() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // this will redirect to asdftestblog1.files.wordpress.com

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // This will redirect to asdftestblog1.files.wordpress.com.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $url = 'https://asdftestblog1.wordpress.com/files/2007/09/2007-06-30-dsc_4700-1.jpg';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $response = wp_remote_get( $url );

</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"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $headers = wp_remote_retrieve_headers( $response );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // should return the same headers as a head request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Should return the same headers as a HEAD request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 'image/jpeg', $headers['content-type'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( '40148', $headers['content-length'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( '200', wp_remote_retrieve_response_code( $response ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,10 +81,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_get_redirect_limit_exceeded() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // this will redirect to asdftestblog1.files.wordpress.com

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // This will redirect to asdftestblog1.files.wordpress.com.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $url = 'https://asdftestblog1.wordpress.com/files/2007/09/2007-06-30-dsc_4700-1.jpg';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // pretend we've already redirected 5 times

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Pretend we've already redirected 5 times.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $response = wp_remote_get( $url, array( 'redirection' => -1 ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->skipTestOnTimeout( $response );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -183,7 +183,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 43231

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_get_cookie_host_only() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // emulate WP_Http::request() internals

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Emulate WP_Http::request() internals.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $requests_response = new Requests_Response();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $requests_response->cookies['test'] = Requests_Cookie::parse( 'test=foo; domain=.wordpress.org' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -194,12 +194,12 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $response = $http_response->to_array();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // check the host_only flag in the resulting WP_Http_Cookie

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check the host_only flag in the resulting WP_Http_Cookie.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $cookie = wp_remote_retrieve_cookie( $response, 'test' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $cookie->domain, 'wordpress.org' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $cookie->host_only, 'host-only flag not set' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // regurgitate (Requests_Cookie -> WP_Http_Cookie -> Requests_Cookie)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Regurgitate (Requests_Cookie -> WP_Http_Cookie -> Requests_Cookie).

</ins><span class="cx" style="display: block; padding: 0 10px">                 $cookies = WP_Http::normalize_cookies( wp_remote_retrieve_cookies( $response ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $cookies['test']->flags['host-only'], 'host-only flag data lost' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span></span></pre></div>

<a id="trunktestsphpunittestshttphttpphp"></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/http/http.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/http/http.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/http/http.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,29 +17,32 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function make_absolute_url_testcases() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // 0: The Location header, 1: The current url, 3: The expected url

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // 0: The Location header, 1: The current URL, 3: The expected URL.

</ins><span class="cx" style="display: block; padding: 0 10px">                 return array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        array( 'http://site.com/', 'http://example.com/', 'http://site.com/' ), // Absolute URL provided

-                       array( '/location', '', '/location' ), // No current url provided

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Absolute URL provided.

+                       array( 'http://site.com/', 'http://example.com/', 'http://site.com/' ),

+                       // No current URL provided.

+                       array( '/location', '', '/location' ),

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        array( '', 'http://example.com', 'http://example.com/' ), // No location provided

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // No location provided.

+                       array( '', 'http://example.com', 'http://example.com/' ),

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Location provided relative to site root

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Location provided relative to site root.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( '/root-relative-link.ext', 'http://example.com/', 'http://example.com/root-relative-link.ext' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '/root-relative-link.ext?with=query', 'http://example.com/index.ext?query', 'http://example.com/root-relative-link.ext?with=query' ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Location provided relative to current file/directory

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Location provided relative to current file/directory.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( 'relative-file.ext', 'http://example.com/', 'http://example.com/relative-file.ext' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( 'relative-file.ext', 'http://example.com/filename', 'http://example.com/relative-file.ext' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( 'relative-file.ext', 'http://example.com/directory/', 'http://example.com/directory/relative-file.ext' ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Location provided relative to current file/directory but in a parent directory

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Location provided relative to current file/directory but in a parent directory.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( '../file-in-parent.ext', 'http://example.com', 'http://example.com/file-in-parent.ext' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '../file-in-parent.ext', 'http://example.com/filename', 'http://example.com/file-in-parent.ext' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '../file-in-parent.ext', 'http://example.com/directory/', 'http://example.com/file-in-parent.ext' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '../file-in-parent.ext', 'http://example.com/directory/filename', 'http://example.com/file-in-parent.ext' ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Location provided in muliple levels higher, including impossible to reach (../ below DOCROOT)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Location provided in muliple levels higher, including impossible to reach (../ below DOCROOT).

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( '../../file-in-grand-parent.ext', 'http://example.com', 'http://example.com/file-in-grand-parent.ext' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '../../file-in-grand-parent.ext', 'http://example.com/filename', 'http://example.com/file-in-grand-parent.ext' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '../../file-in-grand-parent.ext', 'http://example.com/directory/', 'http://example.com/file-in-grand-parent.ext' ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,14 +55,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '?query=string', 'http://example.com/file.ext?existing=query-string', 'http://example.com/file.ext?query=string' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( 'otherfile.ext?query=string', 'http://example.com/file.ext?existing=query-string', 'http://example.com/otherfile.ext?query=string' ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // A file with a leading dot

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // A file with a leading dot.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( '.ext', 'http://example.com/', 'http://example.com/.ext' ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // URls within URLs

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // URLs within URLs.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( '/expected', 'http://example.com/sub/http://site.com/sub/', 'http://example.com/expected' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '/expected/http://site.com/sub/', 'http://example.com/', 'http://example.com/expected/http://site.com/sub/' ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Schemeless URL's (Not valid in HTTP Headers, but may be used elsewhere)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Schemeless URL's (not valid in HTTP Headers, but may be used elsewhere).

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( '//example.com/sub/', 'https://example.net', 'https://example.com/sub/' ),

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,7 +76,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">        function parse_url_testcases() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // 0: The URL, 1: The expected resulting structure

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // 0: The URL, 1: The expected resulting structure.

</ins><span class="cx" style="display: block; padding: 0 10px">                 return array(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                self::FULL_TEST_URL,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -97,7 +100,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                ),

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // < PHP 5.4.7: Schemeless URL

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // < PHP 5.4.7: Schemeless URL.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                '//example.com/path/',

</span><span class="cx" style="display: block; padding: 0 10px">                                array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -141,7 +144,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                ),

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // PHP's parse_url() calls this an invalid url, we handle it as a path

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // PHP's parse_url() calls this an invalid url, we handle it as a path.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( '/://example.com/', array( 'path' => '/://example.com/' ) ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                        // Schemeless URL containing colons cause parse errors in PHP 7+.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -243,10 +246,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '//fonts.googleapis.com/css?family=Open+Sans:400&subset=latin', PHP_URL_PORT, null ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '//fonts.googleapis.com/css?family=Open+Sans:400&subset=latin', PHP_URL_PATH, '/css' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '//fonts.googleapis.com/css?family=Open+Sans:400&subset=latin', PHP_URL_QUERY, 'family=Open+Sans:400&subset=latin' ),

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        array( '//fonts.googleapis.com/css?family=Open+Sans:400', PHP_URL_HOST, 'fonts.googleapis.com' ), // 25

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 array( '//fonts.googleapis.com/css?family=Open+Sans:400', PHP_URL_HOST, 'fonts.googleapis.com' ),  // 25

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( '//fonts.googleapis.com/css?family=Open+Sans:400', PHP_URL_PORT, null ),

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        array( '//fonts.googleapis.com/css?family=Open+Sans:400', PHP_URL_PATH, '/css' ), //27

-                       array( '//fonts.googleapis.com/css?family=Open+Sans:400', PHP_URL_QUERY, 'family=Open+Sans:400' ), //28

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 array( '//fonts.googleapis.com/css?family=Open+Sans:400', PHP_URL_PATH, '/css' ),                  // 27

+                       array( '//fonts.googleapis.com/css?family=Open+Sans:400', PHP_URL_QUERY, 'family=Open+Sans:400' ), // 28

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                        // Empty string or non-string passed in.

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '', PHP_URL_PATH, '' ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -339,7 +342,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( 'http://example.com/', PHP_URL_HOST, 'example.com' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( 'http://example.com/', PHP_URL_USER, null ),

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        array( 'http:///example.com', -1, false ), // Malformed.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 array( 'http:///example.com', -1, false ),          // Malformed.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( 'http:///example.com', PHP_URL_HOST, null ), // Malformed.

</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="trunktestsphpunittestsimagedimensionsphp"></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/dimensions.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/image/dimensions.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/image/dimensions.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,133 +7,133 @@

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Image_Dimensions extends WP_UnitTestCase {

</span><span class="cx" style="display: block; padding: 0 10px">        function test_400x400_no_crop() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // landscape: resize 640x480 to fit 400x400: 400x300

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Landscape: resize 640x480 to fit 400x400: 400x300.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = image_resize_dimensions( 640, 480, 400, 400, false );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( array( 0, 0, 0, 0, 400, 300, 640, 480 ), $out );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // portrait: resize 480x640 to fit 400x400: 300x400

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Portrait: resize 480x640 to fit 400x400: 300x400.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = image_resize_dimensions( 480, 640, 400, 400, false );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( array( 0, 0, 0, 0, 300, 400, 480, 640 ), $out );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_400x0_no_crop() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // landscape: resize 640x480 to fit 400w: 400x300

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Landscape: resize 640x480 to fit 400w: 400x300.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = image_resize_dimensions( 640, 480, 400, 0, false );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( array( 0, 0, 0, 0, 400, 300, 640, 480 ), $out );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // portrait: resize 480x640 to fit 400w: 400x533

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Portrait: resize 480x640 to fit 400w: 400x533.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = image_resize_dimensions( 480, 640, 400, 0, false );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( array( 0, 0, 0, 0, 400, 533, 480, 640 ), $out );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_0x400_no_crop() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // landscape: resize 640x480 to fit 400h: 533x400

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Landscape: resize 640x480 to fit 400h: 533x400.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = image_resize_dimensions( 640, 480, 0, 400, false );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( array( 0, 0, 0, 0, 533, 400, 640, 480 ), $out );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // portrait: resize 480x640 to fit 400h: 300x400

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Portrait: resize 480x640 to fit 400h: 300x400.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = image_resize_dimensions( 480, 640, 0, 400, false );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( array( 0, 0, 0, 0, 300, 400, 480, 640 ), $out );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_800x800_no_crop() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // landscape: resize 640x480 to fit 800x800

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Landscape: resize 640x480 to fit 800x800.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = image_resize_dimensions( 640, 480, 800, 800, false );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( false, $out );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // portrait: resize 480x640 to fit 800x800

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Portrait: resize 480x640 to fit 800x800.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = image_resize_dimensions( 480, 640, 800, 800, false );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( false, $out );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_800x0_no_crop() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // landscape: resize 640x480 to fit 800w

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Landscape: resize 640x480 to fit 800w.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = image_resize_dimensions( 640, 480, 800, 0, false );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( false, $out );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // portrait: resize 480x640 to fit 800w

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Portrait: resize 480x640 to fit 800w.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = image_resize_dimensions( 480, 640, 800, 0, false );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( false, $out );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_0x800_no_crop() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // landscape: resize 640x480 to fit 800h

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Landscape: resize 640x480 to fit 800h.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = image_resize_dimensions( 640, 480, 0, 800, false );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( false, $out );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // portrait: resize 480x640 to fit 800h

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Portrait: resize 480x640 to fit 800h.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = image_resize_dimensions( 480, 640, 0, 800, false );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( false, $out );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // cropped versions

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Cropped versions.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_400x400_crop() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // landscape: crop 640x480 to fit 400x400: 400x400 taken from a 480x480 crop at (80. 0)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Landscape: crop 640x480 to fit 400x400: 400x400 taken from a 480x480 crop at (80. 0).

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = image_resize_dimensions( 640, 480, 400, 400, true );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( array( 0, 0, 80, 0, 400, 400, 480, 480 ), $out );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // portrait: resize 480x640 to fit 400x400: 400x400 taken from a 480x480 crop at (0. 80)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Portrait: resize 480x640 to fit 400x400: 400x400 taken from a 480x480 crop at (0. 80).

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = image_resize_dimensions( 480, 640, 400, 400, true );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( array( 0, 0, 0, 80, 400, 400, 480, 480 ), $out );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_400x0_crop() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // landscape: resize 640x480 to fit 400w: 400x300

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Landscape: resize 640x480 to fit 400w: 400x300.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = image_resize_dimensions( 640, 480, 400, 0, true );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( array( 0, 0, 0, 0, 400, 300, 640, 480 ), $out );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // portrait: resize 480x640 to fit 400w: 400x533

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Portrait: resize 480x640 to fit 400w: 400x533.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = image_resize_dimensions( 480, 640, 400, 0, true );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( array( 0, 0, 0, 0, 400, 533, 480, 640 ), $out );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_0x400_crop() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // landscape: resize 640x480 to fit 400h: 533x400

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Landscape: resize 640x480 to fit 400h: 533x400.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = image_resize_dimensions( 640, 480, 0, 400, true );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( array( 0, 0, 0, 0, 533, 400, 640, 480 ), $out );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // portrait: resize 480x640 to fit 400h: 300x400

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Portrait: resize 480x640 to fit 400h: 300x400.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = image_resize_dimensions( 480, 640, 0, 400, true );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( array( 0, 0, 0, 0, 300, 400, 480, 640 ), $out );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_400x500_crop() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // landscape: crop 640x480 to fit 400x500: 400x400 taken from a 480x480 crop at (80. 0)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Landscape: crop 640x480 to fit 400x500: 400x400 taken from a 480x480 crop at (80. 0).

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = image_resize_dimensions( 640, 480, 400, 500, true );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( array( 0, 0, 120, 0, 400, 480, 400, 480 ), $out );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // portrait: resize 480x640 to fit 400x400: 400x400 taken from a 480x480 crop at (0. 80)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Portrait: resize 480x640 to fit 400x400: 400x400 taken from a 480x480 crop at (0. 80).

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = image_resize_dimensions( 480, 640, 400, 500, true );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( array( 0, 0, 0, 20, 400, 500, 480, 600 ), $out );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_640x480() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // crop 640x480 to fit 640x480 (no change)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Crop 640x480 to fit 640x480 (no change).

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = image_resize_dimensions( 640, 480, 640, 480, true );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $out );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // resize 640x480 to fit 640x480 (no change)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Resize 640x480 to fit 640x480 (no change).

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = image_resize_dimensions( 640, 480, 640, 480, false );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $out );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -140,14 +140,14 @@

<span class="cx" style="display: block; padding: 0 10px">                // Test with the filter override.

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'wp_image_resize_identical_dimensions', '__return_true' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // crop 640x480 to fit 640x480 (no change)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Crop 640x480 to fit 640x480 (no change).

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = image_resize_dimensions( 640, 480, 640, 480, true );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( array( 0, 0, 0, 0, 640, 480, 640, 480 ), $out );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // resize 640x480 to fit 640x480 (no change)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Resize 640x480 to fit 640x480 (no change).

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = image_resize_dimensions( 640, 480, 640, 480, false );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( array( 0, 0, 0, 0, 640, 480, 640, 480 ), $out );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                remove_filter( 'wp_image_resize_identical_dimensions', '__return_true' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -157,28 +157,28 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 19393

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_crop_anchors() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // landscape: crop 640x480 to fit 400x500: 400x400 taken from a 480x480 crop

-               // src_x = 0 (left), src_y = 0 (top)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Landscape: crop 640x480 to fit 400x500: 400x400 taken from a 480x480 crop.

+               // src_x = 0 (left), src_y = 0 (top).

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = image_resize_dimensions( 640, 480, 400, 500, array( 'left', 'top' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( array( 0, 0, 0, 0, 400, 480, 400, 480 ), $out );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // portrait: resize 480x640 to fit 400x400: 400x400 taken from a 480x480 crop

-               // src_x = 0 (left), src_y = 0 (top)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Portrait: resize 480x640 to fit 400x400: 400x400 taken from a 480x480 crop.

+               // src_x = 0 (left), src_y = 0 (top).

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = image_resize_dimensions( 480, 640, 400, 500, array( 'left', 'top' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( array( 0, 0, 0, 0, 400, 500, 480, 600 ), $out );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // landscape: crop 640x480 to fit 400x500: 400x400 taken from a 480x480 crop

-               // src_x = 240 (left), src_y = 0 (due to landscape crop)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Landscape: crop 640x480 to fit 400x500: 400x400 taken from a 480x480 crop.

+               // src_x = 240 (left), src_y = 0 (due to landscape crop).

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = image_resize_dimensions( 640, 480, 400, 500, array( 'right', 'bottom' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( array( 0, 0, 240, 0, 400, 480, 400, 480 ), $out );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // portrait: resize 480x640 to fit 400x400: 400x400 taken from a 480x480 crop

-               // src_x = 0 (due to portrait crop), src_y = 40 (bottom)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Portrait: resize 480x640 to fit 400x400: 400x400 taken from a 480x480 crop.

+               // src_x = 0 (due to portrait crop), src_y = 40 (bottom).

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = image_resize_dimensions( 480, 640, 400, 500, array( 'right', 'bottom' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( array( 0, 0, 0, 40, 400, 500, 480, 600 ), $out );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunktestsphpunittestsimageeditorphp"></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/editor.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/image/editor.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/image/editor.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -69,11 +69,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_set_quality() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Get an editor

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Get an editor.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $editor = wp_get_image_editor( DIR_TESTDATA . '/images/canola.jpg' );

<span class="cx" style="display: block; padding: 0 10px">                $editor->set_mime_type( 'image/jpeg' ); // Ensure mime-specific filters act properly.

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check default value

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check default value.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 82, $editor->get_quality() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Ensure the quality filters do not have precedence if created after editor instantiation.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -85,11 +85,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'jpeg_quality', $func_95_percent );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 82, $editor->get_quality() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Ensure set_quality() works and overrides the filters

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Ensure set_quality() works and overrides the filters.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( $editor->set_quality( 75 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 75, $editor->get_quality() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Get a new editor to clear default quality state

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Get a new editor to clear default quality state.

</ins><span class="cx" style="display: block; padding: 0 10px">                 unset( $editor );

</span><span class="cx" style="display: block; padding: 0 10px">                $editor = wp_get_image_editor( DIR_TESTDATA . '/images/canola.jpg' );

<span class="cx" style="display: block; padding: 0 10px">                $editor->set_mime_type( 'image/jpeg' ); // Ensure mime-specific filters act properly.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -97,7 +97,7 @@

<span class="cx" style="display: block; padding: 0 10px">                // Ensure jpeg_quality filter applies if it exists before editor instantiation.

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 95, $editor->get_quality() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Get a new editor to clear jpeg_quality state

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Get a new editor to clear jpeg_quality state.

</ins><span class="cx" style="display: block; padding: 0 10px">                 remove_filter( 'jpeg_quality', $func_95_percent );

</span><span class="cx" style="display: block; padding: 0 10px">                unset( $editor );

</span><span class="cx" style="display: block; padding: 0 10px">                $editor = wp_get_image_editor( DIR_TESTDATA . '/images/canola.jpg' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -105,7 +105,7 @@

<span class="cx" style="display: block; padding: 0 10px">                // Ensure wp_editor_set_quality filter applies if it exists before editor instantiation.

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 100, $editor->get_quality() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Clean up

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Clean up.

</ins><span class="cx" style="display: block; padding: 0 10px">                 remove_filter( 'wp_editor_set_quality', $func_100_percent );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -116,7 +116,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_generate_filename() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Get an editor

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Get an editor.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $editor = wp_get_image_editor( DIR_TESTDATA . '/images/canola.jpg' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $property = new ReflectionProperty( $editor, 'size' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -129,16 +129,16 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test with no parameters

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test with no parameters.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 'canola-100x50.jpg', wp_basename( $editor->generate_filename() ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test with a suffix only

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test with a suffix only.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 'canola-new.jpg', wp_basename( $editor->generate_filename( 'new' ) ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test with a destination dir only

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test with a destination dir only.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( trailingslashit( realpath( get_temp_dir() ) ), trailingslashit( realpath( dirname( $editor->generate_filename( null, get_temp_dir() ) ) ) ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test with a suffix only

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test with a suffix only.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 'canola-100x50.png', wp_basename( $editor->generate_filename( null, null, 'png' ) ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                // Combo!

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -154,10 +154,10 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $editor = wp_get_image_editor( DIR_TESTDATA . '/images/canola.jpg' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Size should be false by default

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Size should be false by default.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertNull( $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">-                // Set a size

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set a size.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $size     = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'height' => 50,

</span><span class="cx" style="display: block; padding: 0 10px">                        'width'  => 100,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -177,10 +177,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_get_suffix() {

</span><span class="cx" style="display: block; padding: 0 10px">                $editor = wp_get_image_editor( DIR_TESTDATA . '/images/canola.jpg' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Size should be false by default

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Size should be false by default.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( $editor->get_suffix() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set a size

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set a size.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $size     = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'height' => 50,

</span><span class="cx" style="display: block; padding: 0 10px">                        'width'  => 100,

</span></span></pre></div>

<a id="trunktestsphpunittestsimageeditorGdphp"></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/editorGd.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/image/editorGd.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/image/editorGd.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,7 +100,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected_array, $resized );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Now, verify real dimensions are as expected

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Now, verify real dimensions are as expected.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $image_path = DIR_TESTDATA . '/images/' . $resized[0]['file'];

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertImageDimensions(

</span><span class="cx" style="display: block; padding: 0 10px">                        $image_path,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -375,7 +375,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $resized as $key => $image_data ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $image_path = DIR_TESTDATA . '/images/' . $image_data['file'];

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Now, verify real dimensions are as expected

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Now, verify real dimensions are as expected.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertImageDimensions(

</span><span class="cx" style="display: block; padding: 0 10px">                                $image_path,

</span><span class="cx" style="display: block; padding: 0 10px">                                $expected_array[ $key ]['width'],

</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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/image/editorImagick.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -93,7 +93,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected_array, $resized );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Now, verify real dimensions are as expected

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Now, verify real dimensions are as expected.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $image_path = DIR_TESTDATA . '/images/' . $resized[0]['file'];

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertImageDimensions(

</span><span class="cx" style="display: block; padding: 0 10px">                        $image_path,

</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">                foreach ( $resized as $key => $image_data ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $image_path = DIR_TESTDATA . '/images/' . $image_data['file'];

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Now, verify real dimensions are as expected

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Now, verify real dimensions are as expected.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertImageDimensions(

</span><span class="cx" style="display: block; padding: 0 10px">                                $image_path,

</span><span class="cx" style="display: block; padding: 0 10px">                                $expected_array[ $key ]['width'],

</span></span></pre></div>

<a id="trunktestsphpunittestsimagefunctionsphp"></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/functions.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/image/functions.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/image/functions.php       2020-01-29 00:43:23 UTC (rev 47122)

</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"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_is_image_positive() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // these are all image files recognized by php

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // These are all image files recognized by PHP.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $files = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'test-image-cmyk.jpg',

</span><span class="cx" style="display: block; padding: 0 10px">                        'test-image.bmp',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,7 +72,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_is_image_negative() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // these are actually image files but aren't recognized or usable by php

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // These are actually image files but aren't recognized or usable by PHP.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $files = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'test-image.pct',

</span><span class="cx" style="display: block; padding: 0 10px">                        'test-image.tga',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -85,7 +85,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">        function test_is_displayable_image_positive() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // these are all usable in typical web browsers

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // These are all usable in typical web browsers.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $files = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'test-image.gif',

</span><span class="cx" style="display: block; padding: 0 10px">                        'test-image.png',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -103,11 +103,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_is_displayable_image_negative() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // these are image files but aren't suitable for web pages because of compatibility or size issues

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // These are image files but aren't suitable for web pages because of compatibility or size issues.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $files = array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // 'test-image-cmyk.jpg', Allowed in r9727

-                       // 'test-image.bmp', Allowed in r28589

-                       // 'test-image-grayscale.jpg', Allowed in r9727

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // 'test-image-cmyk.jpg',      Allowed in r9727.

+                       // 'test-image.bmp',           Allowed in r28589.

+                       // 'test-image-grayscale.jpg', Allowed in r9727.

</ins><span class="cx" style="display: block; padding: 0 10px">                         'test-image.pct',

</span><span class="cx" style="display: block; padding: 0 10px">                        'test-image.tga',

</span><span class="cx" style="display: block; padding: 0 10px">                        'test-image.sgi',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -135,7 +135,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                include_once( ABSPATH . 'wp-admin/includes/image-edit.php' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Mime types

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Mime types.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $mime_types = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'image/jpeg',

</span><span class="cx" style="display: block; padding: 0 10px">                        'image/gif',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -142,11 +142,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'image/png',

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test each image editor engine

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test each image editor engine.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $classes = array( 'WP_Image_Editor_GD', 'WP_Image_Editor_Imagick' );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $classes as $class ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // If the image editor isn't available, skip it

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // If the image editor isn't available, skip it.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( ! call_user_func( array( $class, 'test' ) ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                continue;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -154,7 +154,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $img    = new $class( DIR_TESTDATA . '/images/canola.jpg' );

</span><span class="cx" style="display: block; padding: 0 10px">                        $loaded = $img->load();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Save a file as each mime type, assert it works

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Save a file as each mime type, assert it works.

</ins><span class="cx" style="display: block; padding: 0 10px">                         foreach ( $mime_types as $mime_type ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( ! $img->supports_mime_type( $mime_type ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        continue;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -166,12 +166,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->assertNotWPError( $ret );

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->assertEquals( $mime_type, $this->get_mime_type( $ret['path'] ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Clean up

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Clean up.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 unlink( $file );

</span><span class="cx" style="display: block; padding: 0 10px">                                unlink( $ret['path'] );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Clean up

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Clean up.

</ins><span class="cx" style="display: block; padding: 0 10px">                         unset( $img );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -186,11 +186,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->markTestSkipped( 'The fileinfo PHP extension is not loaded.' );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test each image editor engine

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test each image editor engine.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $classes = array( 'WP_Image_Editor_GD', 'WP_Image_Editor_Imagick' );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $classes as $class ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // If the image editor isn't available, skip it

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // If the image editor isn't available, skip it.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( ! call_user_func( array( $class, 'test' ) ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                continue;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -198,17 +198,17 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $img    = new $class( DIR_TESTDATA . '/images/canola.jpg' );

</span><span class="cx" style="display: block; padding: 0 10px">                        $loaded = $img->load();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Save the file

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Save the file.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $mime_type = 'image/gif';

</span><span class="cx" style="display: block; padding: 0 10px">                        $file      = wp_tempnam( 'tmp.jpg' );

</span><span class="cx" style="display: block; padding: 0 10px">                        $ret       = $img->save( $file, $mime_type );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Make assertions

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Make assertions.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertNotEmpty( $ret );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertNotWPError( $ret );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $mime_type, $this->get_mime_type( $ret['path'] ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Clean up

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Clean up.

</ins><span class="cx" style="display: block; padding: 0 10px">                         unlink( $file );

</span><span class="cx" style="display: block; padding: 0 10px">                        unlink( $ret['path'] );

</span><span class="cx" style="display: block; padding: 0 10px">                        unset( $img );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -225,7 +225,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->markTestSkipped( 'The fileinfo PHP extension is not loaded.' );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Mime types

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Mime types.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $mime_types = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'jpg'  => 'image/jpeg',

</span><span class="cx" style="display: block; padding: 0 10px">                        'jpeg' => 'image/jpeg',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -232,14 +232,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'jpe'  => 'image/jpeg',

</span><span class="cx" style="display: block; padding: 0 10px">                        'gif'  => 'image/gif',

</span><span class="cx" style="display: block; padding: 0 10px">                        'png'  => 'image/png',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'unk'  => 'image/jpeg', // Default, unknown

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'unk'  => 'image/jpeg', // Default, unknown.

</ins><span class="cx" style="display: block; padding: 0 10px">                 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test each image editor engine

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test each image editor engine.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $classes = array( 'WP_Image_Editor_GD', 'WP_Image_Editor_Imagick' );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $classes as $class ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // If the image editor isn't available, skip it

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // If the image editor isn't available, skip it.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( ! call_user_func( array( $class, 'test' ) ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                continue;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -247,7 +247,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $img    = new $class( DIR_TESTDATA . '/images/canola.jpg' );

</span><span class="cx" style="display: block; padding: 0 10px">                        $loaded = $img->load();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Save the image as each file extension, check the mime type

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Save the image as each file extension, check the mime type.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $img = wp_get_image_editor( DIR_TESTDATA . '/images/canola.jpg' );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertNotWPError( $img );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -265,7 +265,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                unlink( $ret['path'] );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Clean up

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Clean up.

</ins><span class="cx" style="display: block; padding: 0 10px">                         unset( $img );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -278,7 +278,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_load_directory() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // First, test with deprecated wp_load_image function

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // First, test with deprecated wp_load_image function.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $editor1 = wp_load_image( DIR_TESTDATA );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotInternalType( 'resource', $editor1 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -288,7 +288,7 @@

<span class="cx" style="display: block; padding: 0 10px">                // Then, test with editors.

</span><span class="cx" style="display: block; padding: 0 10px">                $classes = array( 'WP_Image_Editor_GD', 'WP_Image_Editor_Imagick' );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $classes as $class ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // If the image editor isn't available, skip it

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // If the image editor isn't available, skip it.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( ! call_user_func( array( $class, 'test' ) ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                continue;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span></span></pre></div>

<a id="trunktestsphpunittestsimageheaderphp"></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/header.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/image/header.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/image/header.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -88,7 +88,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'height' => 1200,

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</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->assertEquals( 1500, $dimensions['dst_width'] ); // max width

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertEquals( 1500, $dimensions['dst_width'] ); // Max width.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 230, $dimensions['dst_height'] );

</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="trunktestsphpunittestsimageintermediateSizephp"></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/intermediateSize.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/image/intermediateSize.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/image/intermediateSize.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -74,14 +74,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $file = DIR_TESTDATA . '/images/waffles.jpg';

</span><span class="cx" style="display: block; padding: 0 10px">                $id   = $this->_make_attachment( $file, 0 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // look for a size by name

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Look for a size by name.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $image = image_get_intermediate_size( $id, 'test-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">-                // cleanup

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Cleanup.

</ins><span class="cx" style="display: block; padding: 0 10px">                 remove_image_size( 'test-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">-                // test for the expected string because the array will by definition

-               // return with the correct height and width attributes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test for the expected string because the array will by definition

+               // return with the correct height and width attributes.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( strpos( $image['file'], '330x220' ) > 0 );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -89,7 +89,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 17626

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_get_intermediate_sizes_by_array_exact() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Only one dimention match shouldn't return false positive (see: 17626)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Only one dimention match shouldn't return false positive (see: #17626).

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_image_size( 'test-size', 330, 220, true );

</span><span class="cx" style="display: block; padding: 0 10px">                add_image_size( 'false-height', 330, 400, true );

</span><span class="cx" style="display: block; padding: 0 10px">                add_image_size( 'false-width', 600, 220, true );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -97,12 +97,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $file = DIR_TESTDATA . '/images/waffles.jpg';

</span><span class="cx" style="display: block; padding: 0 10px">                $id   = $this->_make_attachment( $file, 0 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // look for a size by array that exists

-               // note: staying larger than 300px to miss default medium crop

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Look for a size by array that exists.

+               // Note: Staying larger than 300px to miss default medium crop.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $image = image_get_intermediate_size( $id, array( 330, 220 ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // test for the expected string because the array will by definition

-               // return with the correct height and width attributes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test for the expected string because the array will by definition

+               // return with the correct height and width attributes.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( strpos( $image['file'], '330x220' ) > 0 );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -110,8 +110,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 17626

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_get_intermediate_sizes_by_array_nearest() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If an exact size is not found, it should be returned

-               // If not, find nearest size that is larger (see: 17626)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If an exact size is not found, it should be returned.

+               // If not, find nearest size that is larger (see: #17626).

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_image_size( 'test-size', 450, 300, true );

</span><span class="cx" style="display: block; padding: 0 10px">                add_image_size( 'false-height', 330, 100, true );

</span><span class="cx" style="display: block; padding: 0 10px">                add_image_size( 'false-width', 150, 220, true );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -119,12 +119,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $file = DIR_TESTDATA . '/images/waffles.jpg';

</span><span class="cx" style="display: block; padding: 0 10px">                $id   = $this->_make_attachment( $file, 0 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // look for a size by array that doesn't exist

-               // note: staying larger than 300px to miss default medium crop

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Look for a size by array that doesn't exist.

+               // Note: Staying larger than 300px to miss default medium crop.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $image = image_get_intermediate_size( $id, array( 330, 220 ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // you have to test for the string because the image will by definition

-               // return with the correct height and width attributes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test for the expected string because the array will by definition

+               // return with the correct height and width attributes.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( strpos( $image['file'], '450x300' ) > 0 );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -132,8 +132,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 17626

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_get_intermediate_sizes_by_array_nearest_false() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If an exact size is not found, it should be returned

-               // If not, find nearest size that is larger, otherwise return false (see: 17626)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If an exact size is not found, it should be returned.

+               // If not, find nearest size that is larger, otherwise return false (see: #17626).

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_image_size( 'false-height', 330, 100, true );

</span><span class="cx" style="display: block; padding: 0 10px">                add_image_size( 'false-width', 150, 220, true );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -140,12 +140,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $file = DIR_TESTDATA . '/images/waffles.jpg';

</span><span class="cx" style="display: block; padding: 0 10px">                $id   = $this->_make_attachment( $file, 0 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // look for a size by array that doesn't exist

-               // note: staying larger than 300px to miss default medium crop

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Look for a size by array that doesn't exist.

+               // Note: Staying larger than 300px to miss default medium crop.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $image = image_get_intermediate_size( $id, array( 330, 220 ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // you have to test for the string because the image will by definition

-               // return with the correct height and width attributes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test for the expected string because the array will by definition

+               // return with the correct height and width attributes.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( $image );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -153,10 +153,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 17626

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_get_intermediate_sizes_by_array_zero_height() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Generate random width

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Generate random width.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $random_w = rand( 300, 400 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Only one dimention match shouldn't return false positive (see: 17626)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Only one dimention match shouldn't return false positive (see: #17626).

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_image_size( 'test-size', $random_w, 0, false );

</span><span class="cx" style="display: block; padding: 0 10px">                add_image_size( 'false-height', $random_w, 100, true );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -167,12 +167,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $image_w  = $random_w;

</span><span class="cx" style="display: block; padding: 0 10px">                $image_h  = round( ( $image_w / $original['width'] ) * $original['height'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // look for a size by array that exists

-               // note: staying larger than 300px to miss default medium crop

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Look for a size by array that exists.

+               // Note: Staying larger than 300px to miss default medium crop.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $image = image_get_intermediate_size( $id, array( $random_w, 0 ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // test for the expected string because the array will by definition

-               // return with the correct height and width attributes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test for the expected string because the array will by definition

+               // return with the correct height and width attributes.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( strpos( $image['file'], $image_w . 'x' . $image_h ) > 0 );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -184,7 +184,7 @@

<span class="cx" style="display: block; padding: 0 10px">                // 202 is the smallest height that will trigger a miss for 'false-height'.

</span><span class="cx" style="display: block; padding: 0 10px">                $height = 202;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Only one dimention match shouldn't return false positive (see: 17626)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Only one dimention match shouldn't return false positive (see: #17626).

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_image_size( 'test-size', 0, $height, false );

</span><span class="cx" style="display: block; padding: 0 10px">                add_image_size( 'false-height', 300, $height, true );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -195,12 +195,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $image_h  = $height;

</span><span class="cx" style="display: block; padding: 0 10px">                $image_w  = round( ( $image_h / $original['height'] ) * $original['width'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // look for a size by array that exists

-               // note: staying larger than 300px to miss default medium crop

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Look for a size by array that exists.

+               // Note: Staying larger than 300px to miss default medium crop.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $image = image_get_intermediate_size( $id, array( 0, $height ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // test for the expected string because the array will by definition

-               // return with the correct height and width attributes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test for the expected string because the array will by definition

+               // return with the correct height and width attributes.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( strpos( $image['file'], $image_w . 'x' . $image_h ) > 0 );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -221,8 +221,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $image_h  = $height;

</span><span class="cx" style="display: block; padding: 0 10px">                $image_w  = round( ( $image_h / $original['height'] ) * $original['width'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // look for a size by array that exists

-               // note: staying larger than 300px to miss default medium crop

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Look for a size by array that exists.

+               // Note: Staying larger than 300px to miss default medium crop.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $image = image_get_intermediate_size( $id, array( 0, $height ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( strpos( $image['file'], $width . 'x' . $height ) > 0 );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -238,7 +238,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $file = DIR_TESTDATA . '/images/waffles.jpg';

</span><span class="cx" style="display: block; padding: 0 10px">                $id   = $this->_make_attachment( $file, 0 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Request a size by array that doesn't exist and is smaller than the 'thumbnail'

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Request a size by array that doesn't exist and is smaller than the 'thumbnail'.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $image = image_get_intermediate_size( $id, array( 50, 25 ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // We should get the 'test-size' file and not the thumbnail.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -255,7 +255,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $original       = wp_get_attachment_metadata( $id );

</span><span class="cx" style="display: block; padding: 0 10px">                $thumbnail_file = $original['sizes']['thumbnail']['file'];

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Request a size by array that doesn't exist and is smaller than the 'thumbnail'

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Request a size by array that doesn't exist and is smaller than the 'thumbnail'.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $image = image_get_intermediate_size( $id, array( 50, 25 ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // We should get the 'thumbnail' file as a fallback.

</span></span></pre></div>

<a id="trunktestsphpunittestsimagemetaphp"></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/meta.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/image/meta.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/image/meta.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,7 +18,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_exif_d70() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // exif from a Nikon D70

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Exif from a Nikon D70.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = wp_read_image_metadata( DIR_TESTDATA . '/images/2004-07-22-DSC_0008.jpg' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 6.3, $out['aperture'] );

</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"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_exif_d70_mf() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // exif from a Nikon D70 - manual focus lens, so some data is unavailable

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Exif from a Nikon D70 - manual focus lens, so some data is unavailable.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = wp_read_image_metadata( DIR_TESTDATA . '/images/2007-06-17DSC_4173.JPG' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 0, $out['aperture'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,14 +44,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( strtotime( '2007-06-17 21:18:00' ), $out['created_timestamp'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( '', $out['copyright'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 0, $out['focal_length'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 0, $out['iso'] ); // interesting - a Nikon bug?

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertEquals( 0, $out['iso'] ); // Interesting - a Nikon bug?

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 1 / 500, $out['shutter_speed'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( '', $out['title'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                #$this->assertEquals(array('Flowers'), $out['keywords']);

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // $this->assertEquals( array( 'Flowers' ), $out['keywords'] );

</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">        function test_exif_d70_iptc() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // exif from a Nikon D70 with IPTC data added later

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Exif from a Nikon D70 with IPTC data added later.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = wp_read_image_metadata( DIR_TESTDATA . '/images/2004-07-22-DSC_0007.jpg' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 6.3, $out['aperture'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,7 +67,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">        function test_exif_fuji() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // exif from a Fuji FinePix S5600 (thanks Mark)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Exif from a Fuji FinePix S5600 (thanks Mark).

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = wp_read_image_metadata( DIR_TESTDATA . '/images/a2-small.jpg' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 4.5, $out['aperture'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -87,9 +87,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 6571

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_exif_error() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-

</del><span class="cx" style="display: block; padding: 0 10px">                 // https://core.trac.wordpress.org/ticket/6571

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // this triggers a warning mesage when reading the exif block

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // This triggers a warning mesage when reading the Exif block.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = wp_read_image_metadata( DIR_TESTDATA . '/images/waffles.jpg' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 0, $out['aperture'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -105,7 +104,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">        function test_exif_no_data() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // no exif data in this image (from burningwell.org)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // No Exif data in this image (from burningwell.org).

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = wp_read_image_metadata( DIR_TESTDATA . '/images/canola.jpg' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 0, $out['aperture'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,8 +123,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 9417

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_utf8_iptc_tags() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-

-               // trilingual UTF-8 text in the ITPC caption-abstract field

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Trilingual UTF-8 text in the ITPC caption-abstract field.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = wp_read_image_metadata( DIR_TESTDATA . '/images/test-image-iptc.jpg' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'This is a comment. / Это комментарий. / Βλέπετε ένα σχόλιο.', $out['caption'] );

</span></span></pre></div>

<a id="trunktestsphpunittestsimageresizephp"></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/resize.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/image/resize.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/image/resize.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,7 +41,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_resize_png() {

</span><span class="cx" style="display: block; padding: 0 10px">                $image = $this->resize_helper( DIR_TESTDATA . '/images/test-image.png', 25, 25 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( ! is_string( $image ) ) {  // WP_Error, stop GLib-GObject-CRITICAL assertion

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( ! is_string( $image ) ) {  // WP_Error, stop GLib-GObject-CRITICAL assertion.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->fail( sprintf( 'No PNG support in the editor engine %s on this system', $this->editor_engine ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,7 +57,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_resize_gif() {

</span><span class="cx" style="display: block; padding: 0 10px">                $image = $this->resize_helper( DIR_TESTDATA . '/images/test-image.gif', 25, 25 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( ! is_string( $image ) ) {  // WP_Error, stop GLib-GObject-CRITICAL assertion

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( ! is_string( $image ) ) {  // WP_Error, stop GLib-GObject-CRITICAL assertion.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->fail( sprintf( 'No GIF support in the editor engine %s on this system', $this->editor_engine ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,7 +71,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_resize_larger() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // image_resize() should refuse to make an image larger

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // image_resize() should refuse to make an image larger.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $image = $this->resize_helper( DIR_TESTDATA . '/images/test-image.jpg', 100, 100 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'WP_Error', $image );

</span></span></pre></div>

<a id="trunktestsphpunittestsimagesiteIconphp"></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/siteIcon.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/image/siteIcon.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/image/siteIcon.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,7 +56,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Remove custom size.

</span><span class="cx" style="display: block; padding: 0 10px">                unset( $this->wp_site_icon->site_icon_sizes[ array_search( 321, $this->wp_site_icon->site_icon_sizes, true ) ] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Remove the filter we added

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Remove the filter we added.

</ins><span class="cx" style="display: block; padding: 0 10px">                 remove_filter( 'site_icon_image_sizes', array( $this, '_custom_test_sizes' ) );

</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="trunktestsphpunittestsimagesizephp"></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/size.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/image/size.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/image/size.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +8,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Image_Size extends WP_UnitTestCase {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_constrain_dims_zero() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // no constraint - should have no effect

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // No constraint - should have no effect.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = wp_constrain_dimensions( 640, 480, 0, 0 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( array( 640, 480 ), $out );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,7 +23,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_constrain_dims_smaller() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // image size is smaller than the constraint - no effect

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Image size is smaller than the constraint - no effect.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = wp_constrain_dimensions( 500, 600, 1024, 768 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( array( 500, 600 ), $out );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</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">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_constrain_dims_equal() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // image size is equal to the constraint - no effect

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Image size is equal to the constraint - no effect.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = wp_constrain_dimensions( 1024, 768, 1024, 768 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( array( 1024, 768 ), $out );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -47,7 +47,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">        function test_constrain_dims_larger() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // image size is larger than the constraint - result should be constrained

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Image size is larger than the constraint - result should be constrained.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = wp_constrain_dimensions( 1024, 768, 500, 600 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( array( 500, 375 ), $out );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,7 +57,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $out = wp_constrain_dimensions( 1024, 768, 500, 0 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( array( 500, 375 ), $out );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // also try a portrait oriented image

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Also try a portrait oriented image.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = wp_constrain_dimensions( 300, 800, 500, 600 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( array( 225, 600 ), $out );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -69,7 +69,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_constrain_dims_boundary() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // one dimension is larger than the constraint, one smaller - result should be constrained

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // One dimension is larger than the constraint, one smaller - result should be constrained.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = wp_constrain_dimensions( 1024, 768, 500, 800 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( array( 500, 375 ), $out );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,7 +76,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $out = wp_constrain_dimensions( 1024, 768, 2000, 700 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( array( 933, 700 ), $out );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // portrait

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Portrait.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = wp_constrain_dimensions( 768, 1024, 800, 500 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( array( 375, 500 ), $out );

</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">         * @expectedDeprecated wp_shrink_dimensions

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_shrink_dimensions_smaller() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // image size is smaller than the constraint - no effect

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Image size is smaller than the constraint - no effect.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = wp_shrink_dimensions( 500, 600, 1024, 768 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( array( 500, 600 ), $out );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -111,7 +111,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @expectedDeprecated wp_shrink_dimensions

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_shrink_dimensions_equal() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // image size is equal to the constraint - no effect

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Image size is equal to the constraint - no effect.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = wp_shrink_dimensions( 500, 600, 500, 600 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( array( 500, 600 ), $out );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -123,7 +123,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @expectedDeprecated wp_shrink_dimensions

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_shrink_dimensions_larger() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // image size is larger than the constraint - result should be constrained

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Image size is larger than the constraint - result should be constrained.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = wp_shrink_dimensions( 1024, 768, 500, 600 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( array( 500, 375 ), $out );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -135,7 +135,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @expectedDeprecated wp_shrink_dimensions

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_shrink_dimensions_boundary() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // one dimension is larger than the constraint, one smaller - result should be constrained

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // One dimension is larger than the constraint, one smaller - result should be constrained.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = wp_shrink_dimensions( 1024, 768, 500, 800 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( array( 500, 375 ), $out );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -142,7 +142,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $out = wp_shrink_dimensions( 1024, 768, 2000, 700 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( array( 933, 700 ), $out );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // portrait

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Portrait.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = wp_shrink_dimensions( 768, 1024, 800, 500 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( array( 375, 500 ), $out );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -159,7 +159,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">        function test_constrain_size_for_editor_medium() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // default max width is 500, no constraint on height

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Default max width is 500, no constraint on height.

</ins><span class="cx" style="display: block; padding: 0 10px">                 global $content_width;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $_content_width = $content_width;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -177,7 +177,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $out = image_constrain_size_for_editor( 64, 64, 'medium' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( array( 64, 64 ), $out );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // content_width should be ignored

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // $content_width should be ignored.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $content_width = 350;

</span><span class="cx" style="display: block; padding: 0 10px">                $out           = image_constrain_size_for_editor( 600, 400, 'medium' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( array( 500, 333 ), $out );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -197,7 +197,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $out = image_constrain_size_for_editor( 64, 64, 'full' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( array( 64, 64 ), $out );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // content_width default is 500

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // $content_width default is 500.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $content_width = 0;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $out = image_constrain_size_for_editor( 600, 400, 'full' );

</span></span></pre></div>

<a id="trunktestsphpunittestsimportbasephp"></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/import/base.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/import/base.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/import/base.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,9 +11,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * <code>

</span><span class="cx" style="display: block; padding: 0 10px">         * $users = array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         *   'alice' => 1, // alice will be mapped to user ID 1

-        *   'bob' => 'john', // bob will be transformed into john

-        *   'eve' => false // eve will be imported as is

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  *   'alice' => 1,      // alice will be mapped to user ID 1.

+        *   'bob'   => 'john', // bob will be transformed into john.

+        *   'eve'   => false   // eve will be imported as is.

</ins><span class="cx" style="display: block; padding: 0 10px">          * );</code>

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @param string $filename Full path of the file to import

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,8 +32,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $new     = array();

</span><span class="cx" style="display: block; padding: 0 10px">                $i       = 0;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // each user is either mapped to a given ID, mapped to a new user

-               // with given login or imported using details in WXR file

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Each user is either mapped to a given ID, mapped to a new user

+               // with given login or imported using details in WXR file.

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $users as $user => $map ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $authors[ $i ] = $user;

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( is_int( $map ) ) {

</span></span></pre></div>

<a id="trunktestsphpunittestsimportimportphp"></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/import/import.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/import/import.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/import/import.php 2020-01-29 00:43:23 UTC (rev 47122)

</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">                require_once DIR_TESTDATA . '/plugins/wordpress-importer/wordpress-importer.php';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                global $wpdb;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // crude but effective: make sure there's no residual data in the main tables

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Crude but effective: make sure there's no residual data in the main tables.

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( array( 'posts', 'postmeta', 'comments', 'terms', 'term_taxonomy', 'term_relationships', 'users', 'usermeta' ) as $table ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared

</span><span class="cx" style="display: block; padding: 0 10px">                        $wpdb->query( "DELETE FROM {$wpdb->$table}" );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,7 +49,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->_import_wp( DIR_TESTDATA . '/export/small-export.xml', $authors );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // ensure that authors were imported correctly

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Ensure that authors were imported correctly.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $user_count = count_users();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 3, $user_count['total_users'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $admin = get_user_by( 'login', 'admin' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -64,7 +64,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'author', $author->user_login );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'author@example.org', $author->user_email );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // check that terms were imported correctly

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check that terms were imported correctly.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 30, wp_count_terms( 'category' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 3, wp_count_terms( 'post_tag' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $foo = get_term_by( 'slug', 'foo', 'category' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,7 +73,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $foo_bar = get_term_by( 'slug', 'foo-bar', 'category' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $bar->term_id, $foo_bar->parent );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // check that posts/pages were imported correctly

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check that posts/pages were imported correctly.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post_count = wp_count_posts( 'post' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 5, $post_count->publish );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 1, $post_count->private );

</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"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_ordering_of_importers() {

</span><span class="cx" style="display: block; padding: 0 10px">                global $wp_importers;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $_wp_importers = $wp_importers; // Preserve global state

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $_wp_importers = $wp_importers; // Preserve global state.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $wp_importers  = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'xyz1' => array( 'xyz1' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        'XYZ2' => array( 'XYZ2' ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -268,7 +268,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                        get_importers()

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $wp_importers = $_wp_importers; // Restore global state

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $wp_importers = $_wp_importers; // Restore global state.

</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">@@ -294,6 +294,4 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( 'Slashes aren\\\'t \"cool\"', $posts[0]->post_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">-

-       // function test_menu_import

</del><span class="cx" style="display: block; padding: 0 10px"> }

</span></span></pre></div>

<a id="trunktestsphpunittestsimportparserphp"></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/import/parser.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/import/parser.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/import/parser.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,7 +27,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_malformed_wxr() {

</span><span class="cx" style="display: block; padding: 0 10px">                $file = DIR_TESTDATA . '/export/malformed.xml';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // regex based parser cannot detect malformed XML

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Regex based parser cannot detect malformed XML.

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( array( 'WXR_Parser_SimpleXML', 'WXR_Parser_XML' ) as $p ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $parser = new $p;

</span><span class="cx" style="display: block; padding: 0 10px">                        $result = $parser->parse( $file );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -296,5 +296,5 @@

</span><span class="cx" style="display: 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">-        // tags in CDATA #11574

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Tags in CDATA #11574.

</ins><span class="cx" style="display: block; padding: 0 10px"> }

</span></span></pre></div>

<a id="trunktestsphpunittestsimportpostmetaphp"></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/import/postmeta.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/import/postmeta.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/import/postmeta.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,9 +83,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_serialized_postmeta_with_cdata() {

</span><span class="cx" style="display: block; padding: 0 10px">                $this->_import_wp( DIR_TESTDATA . '/export/test-serialized-postmeta-with-cdata.xml', array( 'johncoswell' => 'johncoswell' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //HTML in the CDATA should work with old WordPress version

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // HTML in the CDATA should work with old WordPress version.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( '<pre>some html</pre>', get_post_meta( 10, 'contains-html', true ) );

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //Serialised will only work with 3.0 onwards.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Serialised will only work with 3.0 onwards.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $expected['special_post_title'] = 'A special title';

</span><span class="cx" style="display: block; padding: 0 10px">                $expected['is_calendar']        = '';

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected, get_post_meta( 10, 'post-options', true ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,7 +96,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_serialized_postmeta_with_evil_stuff_in_cdata() {

</span><span class="cx" style="display: block; padding: 0 10px">                $this->_import_wp( DIR_TESTDATA . '/export/test-serialized-postmeta-with-cdata.xml', array( 'johncoswell' => 'johncoswell' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // evil content in the CDATA

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Evil content in the CDATA.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( '<wp:meta_value>evil</wp:meta_value>', get_post_meta( 10, 'evil', 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="trunktestsphpunittestsincludeshelpersphp"></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/includes/helpers.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/includes/helpers.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/includes/helpers.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,9 +10,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function data_assertEqualSets() {

</span><span class="cx" style="display: block; padding: 0 10px">                return array(

</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">-                                array( 1, 2, 3 ), // test expected

-                               array( 1, 2, 3 ), // test actual

-                               false,             // exception expected

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         array( 1, 2, 3 ), // Test expected.

+                               array( 1, 2, 3 ), // Test actual.

+                               false,            // Exception expected.

</ins><span class="cx" style="display: block; padding: 0 10px">                         ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                array( 1, 2, 3 ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,9 +71,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function data_assertEqualSetsWithIndex() {

</span><span class="cx" style="display: block; padding: 0 10px">                return array(

</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">-                                array( 1, 2, 3 ), // test expected

-                               array( 1, 2, 3 ), // test actual

-                               false,             // exception expected

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         array( 1, 2, 3 ), // Test expected.

+                               array( 1, 2, 3 ), // Test actual.

+                               false,            // Exception expected.

</ins><span class="cx" style="display: block; padding: 0 10px">                         ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                array(

</span></span></pre></div>

<a id="trunktestsphpunittestsksesphp"></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/kses.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/kses.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/kses.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1034,7 +1034,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function data_wildcard_attribute_prefixes() {

</span><span class="cx" style="display: block; padding: 0 10px">                return array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Ends correctly

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Ends correctly.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( 'data-*', true ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                        // Does not end with trialing `-`.

</span></span></pre></div>

<a id="trunktestsphpunittestslinkgetAdjacentPostphp"></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/link/getAdjacentPost.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/link/getAdjacentPost.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/link/getAdjacentPost.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,7 +10,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 17807

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_get_adjacent_post() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Need some sample posts to test adjacency

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Need some sample posts to test adjacency.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post_one = self::factory()->post->create_and_get(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_title' => 'First',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,7 +39,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Assign some terms

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Assign some terms.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_set_object_terms( $post_one->ID, 'WordPress', 'category', false );

</span><span class="cx" style="display: block; padding: 0 10px">                wp_set_object_terms( $post_three->ID, 'WordPress', 'category', false );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,7 +46,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                wp_set_object_terms( $post_two->ID, 'plugins', 'post_tag', false );

</span><span class="cx" style="display: block; padding: 0 10px">                wp_set_object_terms( $post_four->ID, 'plugins', 'post_tag', 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">-                // Test normal post adjacency

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test normal post adjacency.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->go_to( get_permalink( $post_two->ID ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $post_one, get_adjacent_post( false, '', true ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -55,31 +55,31 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEquals( $post_two, get_adjacent_post( false, '', true ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEquals( $post_two, get_adjacent_post( false, '', 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">-                // Test category adjacency

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test category adjacency.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->go_to( get_permalink( $post_one->ID ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( '', get_adjacent_post( true, '', true, 'category' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $post_three, get_adjacent_post( true, '', false, 'category' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test tag adjacency

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test tag adjacency.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->go_to( get_permalink( $post_two->ID ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( '', get_adjacent_post( true, '', true, 'post_tag' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $post_four, get_adjacent_post( true, '', false, 'post_tag' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test normal boundary post

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test normal boundary post.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->go_to( get_permalink( $post_two->ID ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array( $post_one ), get_boundary_post( false, '', true ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array( $post_four ), get_boundary_post( false, '', 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">-                // Test category boundary post

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test category boundary post.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->go_to( get_permalink( $post_one->ID ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array( $post_one ), get_boundary_post( true, '', true, 'category' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array( $post_three ), get_boundary_post( true, '', false, 'category' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test tag boundary post

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test tag boundary post.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->go_to( get_permalink( $post_two->ID ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array( $post_two ), get_boundary_post( true, '', true, 'post_tag' ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -144,7 +144,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // First post

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // First post.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->go_to( get_permalink( $one ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $two, get_adjacent_post( false, array(), false ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $three, get_adjacent_post( true, array(), false ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -152,7 +152,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $four, get_adjacent_post( true, array( $exclude ), false ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEmpty( get_adjacent_post( false, array(), 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">-                // Fourth post

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Fourth post.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->go_to( get_permalink( $four ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $five, get_adjacent_post( false, array(), false ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $five, get_adjacent_post( true, array(), false ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -164,7 +164,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $two, get_adjacent_post( false, array( $exclude ), true ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEmpty( get_adjacent_post( true, array( $exclude ), 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">-                // Last post

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Last post.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->go_to( get_permalink( $five ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $four, get_adjacent_post( false, array(), true ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $four, get_adjacent_post( true, array(), true ) );

</span></span></pre></div>

<a id="trunktestsphpunittestslinkgetAdjacentPostLinkphp"></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/link/getAdjacentPostLink.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/link/getAdjacentPostLink.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/link/getAdjacentPostLink.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,7 +48,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //set current post (has 2 on each end)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set current post (has 2 on each end).

</ins><span class="cx" style="display: block; padding: 0 10px">                 global $GLOBALS;

</span><span class="cx" style="display: block; padding: 0 10px">                $GLOBALS['post'] = get_post( $this->post_ids[2] );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span></span></pre></div>

<a id="trunktestsphpunittestslinkphp"></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/link.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/link.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/link.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,12 +30,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $post_id  = self::factory()->post->create();

</span><span class="cx" style="display: block; padding: 0 10px">                $post_id2 = self::factory()->post->create();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Basic case

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Basic case.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( get_permalink( $post_id ), wp_get_shortlink( $post_id, 'post' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                unset( $GLOBALS['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">-                // Global post is not set

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Global post is not set.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( '', wp_get_shortlink( 0, 'post' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( '', wp_get_shortlink( 0 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( '', wp_get_shortlink() );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,17 +42,17 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $GLOBALS['post'] = get_post( $post_id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Global post is set

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Global post is set.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( get_permalink( $post_id ), wp_get_shortlink( 0, 'post' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( get_permalink( $post_id ), wp_get_shortlink( 0 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( get_permalink( $post_id ), wp_get_shortlink() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Not the global post

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Not the global post.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( get_permalink( $post_id2 ), wp_get_shortlink( $post_id2, 'post' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                unset( $GLOBALS['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">-                // Global post is not set, once again

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Global post is not set, once again.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( '', wp_get_shortlink( 0, 'post' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( '', wp_get_shortlink( 0 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( '', wp_get_shortlink() );

</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->assertNotEquals( get_permalink( $post_id ), wp_get_shortlink( $post_id, 'post' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( home_url( '?p=' . $post_id ), wp_get_shortlink( $post_id, 'post' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Global post and permalink structure are set

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Global post and permalink structure are set.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $GLOBALS['post'] = get_post( $post_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( home_url( '?p=' . $post_id ), wp_get_shortlink( 0, 'post' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( home_url( '?p=' . $post_id ), wp_get_shortlink( 0 ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,7 +73,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wp_get_shortlink_with_page() {

</span><span class="cx" style="display: block; padding: 0 10px">                $post_id = self::factory()->post->create( array( 'post_type' => 'page' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Basic case

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Basic case.

</ins><span class="cx" style="display: block; padding: 0 10px">                 // Don't test against get_permalink() since it uses ?page_id= for pages.

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( home_url( '?p=' . $post_id ), wp_get_shortlink( $post_id, 'post' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunktestsphpunittestsmailphp"></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/mail.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/mail.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/mail.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -101,10 +101,10 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                wp_mail( $to, $subject, $message, $headers );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // WordPress 3.2 and later correctly split the address into the two parts and send them seperately to PHPMailer

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // WordPress 3.2 and later correctly split the address into the two parts and send them separately to PHPMailer.

</ins><span class="cx" style="display: block; padding: 0 10px">                 // Earlier versions of PHPMailer were not touchy about the formatting of these arguments.

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //retrieve the mailer instance

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Retrieve the mailer instance.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $mailer = tests_retrieve_phpmailer_instance();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'address@tld.com', $mailer->get_recipient( 'to' )->address );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'Name', $mailer->get_recipient( 'to' )->name );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -125,7 +125,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                wp_mail( $to, $subject, $message );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // WordPress 3.2 and later correctly split the address into the two parts and send them seperately to PHPMailer

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // WordPress 3.2 and later correctly split the address into the two parts and send them separately to PHPMailer.

</ins><span class="cx" style="display: block; padding: 0 10px">                 // Earlier versions of PHPMailer were not touchy about the formatting of these arguments.

</span><span class="cx" style="display: block; padding: 0 10px">                $mailer = tests_retrieve_phpmailer_instance();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'address@tld.com', $mailer->get_recipient( 'to' )->address );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -167,13 +167,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 23642

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wp_mail_return_value() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // No errors

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // No errors.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( wp_mail( 'valid@address.com', 'subject', 'body' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Non-fatal errors

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Non-fatal errors.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( wp_mail( 'valid@address.com', 'subject', 'body', "Cc: invalid-address\nBcc: @invalid.address", ABSPATH . '/non-existant-file.html' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Fatal errors

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Fatal errors.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( wp_mail( 'invalid.address', 'subject', 'body', '', array() ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -400,7 +400,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'phpmailer_exception_code' => 2,

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //Retrieve the arguments passed to the 'wp_mail_failed' hook callbacks

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Retrieve the arguments passed to the 'wp_mail_failed' hook callbacks.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $all_args  = $ma->get_args();

</span><span class="cx" style="display: block; padding: 0 10px">                $call_args = array_pop( $all_args );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunktestsphpunittestsmediaphp"></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/media.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/media.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/media.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -272,7 +272,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function data_autoembed() {

</span><span class="cx" style="display: block; padding: 0 10px">                return array(

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Should embed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Should embed.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'https://w.org',

</span><span class="cx" style="display: block; padding: 0 10px">                                '[embed]',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -308,7 +308,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> </p>',

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Should NOT embed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Should NOT embed.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'test https://w.org</p>',

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -336,7 +336,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">        function test_wp_prepare_attachment_for_js() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Attachment without media

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Attachment without media.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $id   = wp_insert_attachment(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_status'           => 'publish',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -353,11 +353,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( '', $prepped['mime'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( '', $prepped['type'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( '', $prepped['subtype'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // #21963, there will be a guid always, so there will be a URL

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // #21963, there will be a GUID always, so there will be a URL.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertNotEquals( '', $prepped['url'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( site_url( 'wp-includes/images/media/default.png' ), $prepped['icon'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Fake a mime

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Fake a mime.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post->post_mime_type = 'image/jpeg';

</span><span class="cx" style="display: block; padding: 0 10px">                $prepped              = wp_prepare_attachment_for_js( $post );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'image/jpeg', $prepped['mime'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -364,7 +364,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'image', $prepped['type'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'jpeg', $prepped['subtype'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Fake a mime without a slash. See #WP22532

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Fake a mime without a slash. See #WP22532.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post->post_mime_type = 'image';

</span><span class="cx" style="display: block; padding: 0 10px">                $prepped              = wp_prepare_attachment_for_js( $post );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'image', $prepped['mime'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -426,7 +426,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $gb = $mb * 1024;

</span><span class="cx" style="display: block; padding: 0 10px">                $tb = $gb * 1024;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // test if boundaries are correct

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test if boundaries are correct.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( '1TB', wp_convert_bytes_to_hr( $tb ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( '1GB', wp_convert_bytes_to_hr( $gb ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( '1MB', wp_convert_bytes_to_hr( $mb ) );

</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">                $this->assertEquals( '1 MB', size_format( $mb ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( '1 KB', size_format( $kb ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // now some values around

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Now some values around.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $hr = wp_convert_bytes_to_hr( $tb + $tb / 2 + $mb );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 1.50000095367, (float) str_replace( ',', '.', $hr ), 'The values should be equal', 0.0001 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -450,7 +450,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $hr = wp_convert_bytes_to_hr( $gb - $mb - $kb );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 1022.99902344, (float) str_replace( ',', '.', $hr ), 'The values should be equal', 0.0001 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // edge

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Edge.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( '-1B', wp_convert_bytes_to_hr( -1 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( '0B', wp_convert_bytes_to_hr( 0 ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -612,11 +612,11 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $galleries = get_post_galleries( $post_id_two, 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">-                // Set the global $post context

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set the global $post context.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $GLOBALS['post']               = get_post( $post_id_two );

</span><span class="cx" style="display: block; padding: 0 10px">                $galleries_with_global_context = get_post_galleries( $post_id_two, 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">-                // Check that the global post state doesn't affect the results

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check that the global post state doesn't affect the results.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertSame( $galleries, $galleries_with_global_context );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEmpty( $galleries[0]['src'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1011,7 +1011,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $sizes = wp_get_additional_image_sizes();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Clean up

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Clean up.

</ins><span class="cx" style="display: block; padding: 0 10px">                 remove_image_size( 'test-size' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'test-size', $sizes );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1036,7 +1036,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                add_image_size( 'test-size', 200, 600 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( has_image_size( 'test-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">-                // Clean up

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Clean up.

</ins><span class="cx" style="display: block; padding: 0 10px">                 remove_image_size( 'test-size' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1141,7 +1141,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_media_handle_upload_sets_post_excerpt() {

</span><span class="cx" style="display: block; padding: 0 10px">                $iptc_file = DIR_TESTDATA . '/images/test-image-iptc.jpg';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make a copy of this file as it gets moved during the file upload

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make a copy of this file as it gets moved during the file upload.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $tmp_name = wp_tempnam( $iptc_file );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                copy( $iptc_file, $tmp_name );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1180,7 +1180,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_media_handle_upload_expected_titles() {

</span><span class="cx" style="display: block; padding: 0 10px">                $test_file = DIR_TESTDATA . '/images/test-image.jpg';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make a copy of this file as it gets moved during the file upload

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make a copy of this file as it gets moved during the file upload.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $tmp_name = wp_tempnam( $test_file );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                copy( $test_file, $tmp_name );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1496,7 +1496,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wp_calculate_image_srcset_no_date_uploads() {

</span><span class="cx" style="display: block; padding: 0 10px">                $_wp_additional_image_sizes = wp_get_additional_image_sizes();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Disable date organized uploads

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Disable date organized uploads.

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_filter( 'upload_dir', '_upload_dir_no_subdir' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Make an image.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1534,7 +1534,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertSame( $expected_srcset, wp_calculate_image_srcset( $size_array, $image_url, $image_meta ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Remove the attachment

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Remove the attachment.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_delete_attachment( $id );

</span><span class="cx" style="display: block; padding: 0 10px">                remove_filter( 'upload_dir', '_upload_dir_no_subdir' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1554,7 +1554,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $filename_base = wp_basename( $image_meta['file'], '.png' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Add the hash to the image URL

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Add the hash to the image URL.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $image_url = str_replace( $filename_base, $filename_base . '-' . $hash, $image_url );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Replace file paths for full and medium sizes with hashed versions.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1604,7 +1604,7 @@

<span class="cx" style="display: block; padding: 0 10px">                // Add the full size width at the end.

</span><span class="cx" style="display: block; padding: 0 10px">                $expected .= $uploads_dir_url . $image_meta['file'] . ' ' . $image_meta['width'] . 'w';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Prepend an absolute path to simulate a pre-2.7 upload

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Prepend an absolute path to simulate a pre-2.7 upload.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $image_meta['file'] = 'H:\home\wordpress\trunk/wp-content/uploads/' . $image_meta['file'];

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $intermediates as $int ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1621,7 +1621,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wp_calculate_image_srcset_false() {

</span><span class="cx" style="display: block; padding: 0 10px">                $sizes = wp_calculate_image_srcset( array( 400, 300 ), 'file.png', array() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // For canola.jpg we should return

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // For canola.jpg we should return.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( $sizes );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1776,7 +1776,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        1600 => 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/2015/12/test.png 1600w',

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // No sizes array

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // No sizes array.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $image_meta1 = $image_meta;

</span><span class="cx" style="display: block; padding: 0 10px">                unset( $image_meta1['sizes'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( wp_calculate_image_srcset( $size_array, $image_src, $image_meta1 ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1786,12 +1786,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $image_meta2['sizes'] = '';

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( wp_calculate_image_srcset( $size_array, $image_src, $image_meta2 ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // File name is incorrect

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // File name is incorrect.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $image_meta3         = $image_meta;

</span><span class="cx" style="display: block; padding: 0 10px">                $image_meta3['file'] = '/';

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( wp_calculate_image_srcset( $size_array, $image_src, $image_meta3 ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // File name is incorrect

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // File name is incorrect.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $image_meta4 = $image_meta;

</span><span class="cx" style="display: block; padding: 0 10px">                unset( $image_meta4['file'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( wp_calculate_image_srcset( $size_array, $image_src, $image_meta4 ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1855,7 +1855,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $_wp_additional_image_sizes = wp_get_additional_image_sizes();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $image_meta = wp_get_attachment_metadata( self::$large_id );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $size_array = array( 1600, 1200 ); // full size

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $size_array = array( 1600, 1200 ); // Full size.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $srcset = wp_get_attachment_image_srcset( self::$large_id, $size_array, $image_meta );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1981,7 +1981,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $img_xhtml            = str_replace( ' />', '/>', $img );

</span><span class="cx" style="display: block; padding: 0 10px">                $img_html5            = str_replace( ' />', '>', $img );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Manually add srcset and sizes to the markup from get_image_tag();

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Manually add srcset and sizes to the markup from get_image_tag().

</ins><span class="cx" style="display: block; padding: 0 10px">                 $respimg                  = preg_replace( '|<img ([^>]+) />|', '<img $1 ' . $srcset . ' ' . $sizes . ' />', $img );

</span><span class="cx" style="display: block; padding: 0 10px">                $respimg_no_size_in_class = preg_replace( '|<img ([^>]+) />|', '<img $1 ' . $srcset . ' ' . $sizes . ' />', $img_no_size_in_class );

</span><span class="cx" style="display: block; padding: 0 10px">                $respimg_no_width_height  = preg_replace( '|<img ([^>]+) />|', '<img $1 ' . $srcset . ' ' . $sizes . ' />', $img_no_width_height );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2031,7 +2031,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wp_make_content_images_responsive_wrong() {

</span><span class="cx" style="display: block; padding: 0 10px">                $image = get_image_tag( self::$large_id, '', '', '', 'medium' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Replace the src URL

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Replace the src URL.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $image_wrong_src = preg_replace( '|src="[^"]+"|', 'src="http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/foo.jpg"', $image );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( $image_wrong_src, wp_make_content_images_responsive( $image_wrong_src ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2432,7 +2432,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_media_handle_upload_uses_post_parent_for_directory_date() {

</span><span class="cx" style="display: block; padding: 0 10px">                $iptc_file = DIR_TESTDATA . '/images/test-image-iptc.jpg';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make a copy of this file as it gets moved during the file upload

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make a copy of this file as it gets moved during the file upload.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $tmp_name = wp_tempnam( $iptc_file );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                copy( $iptc_file, $tmp_name );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2478,7 +2478,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_media_handle_upload_ignores_page_parent_for_directory_date() {

</span><span class="cx" style="display: block; padding: 0 10px">                $iptc_file = DIR_TESTDATA . '/images/test-image-iptc.jpg';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make a copy of this file as it gets moved during the file upload

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make a copy of this file as it gets moved during the file upload.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $tmp_name = wp_tempnam( $iptc_file );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                copy( $iptc_file, $tmp_name );

</span></span></pre></div>

<a id="trunktestsphpunittestsmetaqueryphp"></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/meta/query.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/meta/query.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/meta/query.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -45,8 +45,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_invalid_query_clauses() {

</span><span class="cx" style="display: block; padding: 0 10px">                $query = new WP_Meta_Query(

</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">-                                'foo', // empty string

-                               5, // int

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         'foo', // Empty string.

+                               5,     // int

</ins><span class="cx" style="display: block; padding: 0 10px">                                 false, // bool

</span><span class="cx" style="display: block; padding: 0 10px">                                array(),

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,7 +76,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 1, substr_count( $sql['join'], 'INNER JOIN' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // also check mixing key and key => value

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Also check mixing key and key => value.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $query = new WP_Meta_Query(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -174,7 +174,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $query = new WP_Meta_Query();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // just meta_value

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Just meta_value.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $expected = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'relation' => 'OR',

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -188,7 +188,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected, $query->queries );

</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_key & meta_value

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // meta_key & meta_value.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $expected = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'relation' => 'OR',

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -204,7 +204,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected, $query->queries );

</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_compare

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // meta_compare.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $expected = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'relation' => 'OR',

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -562,30 +562,30 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'relation' => 'OR',

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Empty 'compare'

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Empty 'compare'.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 array(

</span><span class="cx" style="display: block; padding: 0 10px">                                        'key' => 'foo',

</span><span class="cx" style="display: block; padding: 0 10px">                                ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Non-empty 'compare'

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Non-empty 'compare'.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 array(

</span><span class="cx" style="display: block; padding: 0 10px">                                        'key'     => 'bar',

</span><span class="cx" style="display: block; padding: 0 10px">                                        'compare' => '<',

</span><span class="cx" style="display: block; padding: 0 10px">                                ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // NOT EXISTS

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // NOT EXISTS.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 array(

</span><span class="cx" style="display: block; padding: 0 10px">                                        'key'     => 'baz',

</span><span class="cx" style="display: block; padding: 0 10px">                                        'compare' => 'NOT EXISTS',

</span><span class="cx" style="display: block; padding: 0 10px">                                ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Has a value

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Has a value.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 array(

</span><span class="cx" style="display: block; padding: 0 10px">                                        'key'   => 'barry',

</span><span class="cx" style="display: block; padding: 0 10px">                                        'value' => 'foo',

</span><span class="cx" style="display: block; padding: 0 10px">                                ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Has no key

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Has no key.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 array(

</span><span class="cx" style="display: block; padding: 0 10px">                                        'value' => 'bar',

</span><span class="cx" style="display: block; padding: 0 10px">                                ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -594,24 +594,24 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $sql = $query1->get_sql( 'post', $wpdb->posts, 'ID', $this );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // 'foo' and 'bar' should be queried against the non-aliased table

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // 'foo' and 'bar' should be queried against the non-aliased table.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertSame( 1, substr_count( $sql['where'], "$wpdb->postmeta.meta_key = 'foo'" ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( 1, substr_count( $sql['where'], "$wpdb->postmeta.meta_key = 'bar'" ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // NOT EXISTS compare queries are not key-only so should not be non-aliased

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // NOT EXISTS compare queries are not key-only so should not be non-aliased.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertSame( 0, substr_count( $sql['where'], "$wpdb->postmeta.meta_key = 'baz'" ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // 'AND' queries don't have key-only queries

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // 'AND' queries don't have key-only queries.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $query2 = new WP_Meta_Query(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'relation' => 'AND',

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Empty 'compare'

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Empty 'compare'.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 array(

</span><span class="cx" style="display: block; padding: 0 10px">                                        'key' => 'foo',

</span><span class="cx" style="display: block; padding: 0 10px">                                ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Non-empty 'compare'

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Non-empty 'compare'.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 array(

</span><span class="cx" style="display: block; padding: 0 10px">                                        'key'     => 'bar',

</span><span class="cx" style="display: block; padding: 0 10px">                                        'compare' => '<',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -621,7 +621,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $sql = $query2->get_sql( 'post', $wpdb->posts, 'ID', $this );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Only 'foo' should be queried against the non-aliased table

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Only 'foo' should be queried against the non-aliased table.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertSame( 1, substr_count( $sql['where'], "$wpdb->postmeta.meta_key = 'foo'" ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( 0, substr_count( $sql['where'], "$wpdb->postmeta.meta_key = 'bar'" ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span></span></pre></div>

<a id="trunktestsphpunittestsmetaslashesphp"></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/meta/slashes.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/meta/slashes.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/meta/slashes.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,7 +31,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Tests the controller function that expects slashed data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Tests the controller function that expects slashed data.

</ins><span class="cx" style="display: block; padding: 0 10px">          */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_edit_post() {

</span><span class="cx" style="display: block; padding: 0 10px">                $id = self::factory()->post->create();

</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">                        $meta_2 = wp_add_post_meta( $id, 'slash_test_2', 'foo' );

</span><span class="cx" style="display: block; padding: 0 10px">                        $meta_3 = wp_add_post_meta( $id, 'slash_test_3', 'foo' );

</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">-                        // expects slashed data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Expects slashed data.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $meta_1 = add_post_meta( $id, 'slash_test_1', addslashes( 'foo' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $meta_2 = add_post_meta( $id, 'slash_test_2', addslashes( 'foo' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $meta_3 = add_post_meta( $id, 'slash_test_3', addslashes( 'foo' ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,8 +65,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'value' => $this->slash_4,

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $_POST                  = add_magic_quotes( $_POST ); // the edit_post() function will strip slashes

</del><span class="cx" style="display: block; padding: 0 10px"> 

<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                $_POST = add_magic_quotes( $_POST ); // The edit_post() function will strip slashes.

+

</ins><span class="cx" style="display: block; padding: 0 10px">                 edit_post();

</span><span class="cx" style="display: block; padding: 0 10px">                $post = get_post( $id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,8 +95,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'value' => $this->slash_5,

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</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                  = add_magic_quotes( $_POST ); // the edit_post() function will strip slashes

</del><span class="cx" style="display: block; padding: 0 10px"> 

<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                $_POST = add_magic_quotes( $_POST ); // The edit_post() function will strip slashes.

+

</ins><span class="cx" style="display: block; padding: 0 10px">                 edit_post();

</span><span class="cx" style="display: block; padding: 0 10px">                $post = get_post( $id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -105,7 +107,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">-         * Tests the legacy model function that expects slashed data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Tests the legacy model function that expects slashed data.

</ins><span class="cx" style="display: block; padding: 0 10px">          */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_add_post_meta() {

</span><span class="cx" style="display: block; padding: 0 10px">                $id = self::factory()->post->create();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -119,7 +121,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">-         * Tests the legacy model function that expects slashed data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Tests the legacy model function that expects slashed data.

</ins><span class="cx" style="display: block; padding: 0 10px">          */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_update_post_meta() {

</span><span class="cx" style="display: block; padding: 0 10px">                $id = self::factory()->post->create();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -133,7 +135,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">-         * Tests the model function that expects slashed data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Tests the model function that expects slashed data.

</ins><span class="cx" style="display: block; padding: 0 10px">          */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_add_comment_meta() {

</span><span class="cx" style="display: block; padding: 0 10px">                $id = self::$comment_id;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -156,7 +158,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">-         * Tests the model function that expects slashed data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Tests the model function that expects slashed data.

</ins><span class="cx" style="display: block; padding: 0 10px">          */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_update_comment_meta() {

</span><span class="cx" style="display: block; padding: 0 10px">                $id = self::$comment_id;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -183,7 +185,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">-         * Tests the model function that expects slashed data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Tests the model function that expects slashed data.

</ins><span class="cx" style="display: block; padding: 0 10px">          */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_add_user_meta() {

</span><span class="cx" style="display: block; padding: 0 10px">                $id = self::factory()->user->create();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -206,7 +208,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Tests the model function that expects slashed data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Tests the model function that expects slashed data.

</ins><span class="cx" style="display: block; padding: 0 10px">          */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_update_user_meta() {

</span><span class="cx" style="display: block; padding: 0 10px">                $id = self::factory()->user->create();

</span></span></pre></div>

<a id="trunktestsphpunittestsmetaphp"></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/meta.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/meta.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/meta.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,46 +27,46 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_delete_metadata_by_mid() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Let's try and delete a non-existing ID, non existing meta

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Let's try and delete a non-existing ID, non existing meta.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( delete_metadata_by_mid( 'user', 0 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( delete_metadata_by_mid( 'non_existing_meta', $this->delete_meta_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">-                // Now let's delete the real meta data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Now let's delete the real meta data.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( delete_metadata_by_mid( 'user', $this->delete_meta_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">-                // And make sure it's been deleted

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // And make sure it's been deleted.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( get_metadata_by_mid( 'user', $this->delete_meta_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">-                // Make sure the caches are cleared

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure the caches are cleared.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( (bool) get_user_meta( $this->author->ID, 'delete_meta_key' ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_update_metadata_by_mid() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Setup

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Setup.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $meta = get_metadata_by_mid( 'user', $this->meta_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">-                // Update the meta value

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Update the meta value.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( update_metadata_by_mid( 'user', $this->meta_id, 'meta_new_value' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $meta = get_metadata_by_mid( 'user', $this->meta_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'meta_new_value', $meta->meta_value );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Update the meta value

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Update the meta value.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( update_metadata_by_mid( 'user', $this->meta_id, 'meta_new_value', 'meta_new_key' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $meta = get_metadata_by_mid( 'user', $this->meta_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'meta_new_key', $meta->meta_key );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Update the key and value

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Update the key and value.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( update_metadata_by_mid( 'user', $this->meta_id, 'meta_value', 'meta_key' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $meta = get_metadata_by_mid( 'user', $this->meta_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'meta_key', $meta->meta_key );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'meta_value', $meta->meta_value );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Update the value that has to be serialized

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Update the value that has to be serialized.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( update_metadata_by_mid( 'user', $this->meta_id, array( 'first', 'second' ) ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $meta = get_metadata_by_mid( 'user', $this->meta_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array( 'first', 'second' ), $meta->meta_value );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Let's try some invalid meta data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Let's try some invalid meta data.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( update_metadata_by_mid( 'user', 0, 'meta_value' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( update_metadata_by_mid( 'user', $this->meta_id, 'meta_value', array( 'invalid', 'key' ) ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -117,7 +117,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_metadata_exists_with_filter() {

<span class="cx" style="display: block; padding: 0 10px">                // Let's see if it returns the correct value when adding a filter.

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'get_user_metadata', '__return_zero' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertFalse( metadata_exists( 'user', $this->author->ID, 'meta_key' ) ); // existing meta key

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertFalse( metadata_exists( 'user', $this->author->ID, 'meta_key' ) ); // Existing meta key.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( metadata_exists( 'user', 1234567890, 'meta_key' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                remove_filter( 'get_user_metadata', '__return_zero' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -139,10 +139,10 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 1, count( $u ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // User found is not locally defined author (it's the admin)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // User found is not locally defined author (it's the admin).

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertNotEquals( $this->author->user_login, $u[0]->user_login );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test EXISTS and NOT EXISTS together, no users should be found

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test EXISTS and NOT EXISTS together, no users should be found.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals(

</span><span class="cx" style="display: block; padding: 0 10px">                        0,

</span><span class="cx" style="display: block; padding: 0 10px">                        count(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -219,7 +219,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( '', get_metadata( 'user', $this->author->ID, $key, true ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( metadata_exists( 'user', $this->author->ID, $key ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test overslashing

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test overslashing.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertInternalType( 'int', add_metadata( 'user', $this->author->ID, $key, $value2 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected2, get_metadata( 'user', $this->author->ID, $key, true ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( delete_metadata( 'user', $this->author->ID, $key ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -255,7 +255,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array( $post_id2, $post_id1 ), $posts->posts );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 2, substr_count( $posts->request, 'CAST(' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make sure the newer meta_query syntax behaves in a consistent way

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure the newer meta_query syntax behaves in a consistent way.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $posts = new WP_Query(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'fields'     => 'ids',

</span></span></pre></div>

<a id="trunktestsphpunittestsmultisitesitephp"></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/multisite/site.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/site.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/multisite/site.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -144,7 +144,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertInternalType( 'int', $blog_id );

</span><span class="cx" style="display: block; padding: 0 10px">                        $prefix = $wpdb->get_blog_prefix( $blog_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">-                        // $get_all = false, only retrieve details from the blogs table

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // $get_all = false, only retrieve details from the blogs table.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $details = get_blog_details( $blog_id, false );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                        // Combine domain and path for a site specific cache key.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -152,14 +152,14 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $details, wp_cache_get( $blog_id . 'short', 'blog-details' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // get_blogaddress_by_name()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // get_blogaddress_by_name().

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertEquals( 'http://' . $details->domain . $details->path, get_blogaddress_by_name( trim( $details->path, '/' ) ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // These are empty until get_blog_details() is called with $get_all = true

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // These are empty until get_blog_details() is called with $get_all = true.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertEquals( false, wp_cache_get( $blog_id, 'blog-details' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( false, wp_cache_get( $key, 'blog-lookup' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // $get_all = true, populate the full blog-details cache and the blog slug lookup cache

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // $get_all = true, populate the full blog-details cache and the blog slug lookup cache.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $details = get_blog_details( $blog_id, true );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $details, wp_cache_get( $blog_id, 'blog-details' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $details, wp_cache_get( $key, 'blog-lookup' ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -187,7 +187,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">-                        // update the blog count cache to use get_blog_count()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Update the blog count cache to use get_blog_count().

</ins><span class="cx" style="display: block; padding: 0 10px">                         wp_update_network_counts();

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( 2, (int) get_blog_count() );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -350,7 +350,7 @@

<span class="cx" style="display: block; padding: 0 10px">                        // Delete the site without forcing a table drop.

</span><span class="cx" style="display: block; padding: 0 10px">                        wpmu_delete_blog( $blog_id, false );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // update the blog count cache to use get_blog_count()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Update the blog count cache to use get_blog_count().

</ins><span class="cx" style="display: block; padding: 0 10px">                         wp_update_network_counts();

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( 1, get_blog_count() );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -364,7 +364,7 @@

<span class="cx" style="display: block; padding: 0 10px">                        // Delete the site and force a table drop.

</span><span class="cx" style="display: block; padding: 0 10px">                        wpmu_delete_blog( $blog_id, 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">-                        // update the blog count cache to use get_blog_count()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Update the blog count cache to use get_blog_count().

</ins><span class="cx" style="display: block; padding: 0 10px">                         wp_update_network_counts();

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( 1, get_blog_count() );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -405,7 +405,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        wpmu_update_blogs_date();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // compare the update time with the current time, allow delta < 2

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Compare the update time with the current time, allow delta < 2.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $blog            = get_site( get_current_blog_id() );

</span><span class="cx" style="display: block; padding: 0 10px">                        $current_time    = time();

</span><span class="cx" style="display: block; padding: 0 10px">                        $time_difference = $current_time - strtotime( $blog->last_updated );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -919,7 +919,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $exists2 = domain_exists( 'foo', 'bar/' );

</span><span class="cx" style="display: block; padding: 0 10px">                        remove_filter( 'domain_exists', array( $this, '_domain_exists_cb' ), 10, 4 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Make sure the same result is returned with or without a trailing slash

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Make sure the same result is returned with or without a trailing slash.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertEquals( $exists1, $exists2 );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2354,11 +2354,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                 * Populate options callback to warm cache for blog-details / site-details cache group

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                public function populate_options_callback() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Cache blog details

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Cache blog details.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $blog_id = get_current_blog_id();

</span><span class="cx" style="display: block; padding: 0 10px">                        get_blog_details( $blog_id );

</span><span class="cx" style="display: block; padding: 0 10px">                        get_site( $blog_id )->siteurl;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Set siteurl

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Set siteurl.

</ins><span class="cx" style="display: block; padding: 0 10px">                         update_option( 'siteurl', 'http://testsite1.example.org/test' );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2420,9 +2420,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                protected function _get_next_site_id() {

</span><span class="cx" style="display: block; padding: 0 10px">                        global $wpdb;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        //create an entry

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Create an entry.

</ins><span class="cx" style="display: block; padding: 0 10px">                         static::factory()->blog->create();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        //get the ID after it

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Get the ID after it.

</ins><span class="cx" style="display: block; padding: 0 10px">                         return (int) $wpdb->get_var( 'SELECT blog_id FROM ' . $wpdb->blogs . ' ORDER BY blog_ID DESC LIMIT 1' ) + 1;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2438,8 +2438,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'default values'  => array(

</span><span class="cx" style="display: block; padding: 0 10px">                                        array(),

</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">-                                                'public' => 0, // `public` is one of the defaults metas in `wpmu_create_blog' function prior WordPress 5.1.0

-                                               'WPLANG' => 'en_US', // WPLANG is another default meta in `wpmu_create_blog` function prior WordPress 5.1.0.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         'public' => 0, // `public` is one of the default metas in `wpmu_create_blog()' function prior to WordPress 5.1.0.

+                                               'WPLANG' => 'en_US', // WPLANG is another default meta in `wpmu_create_blog()` function prior to WordPress 5.1.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">                                'public site'     => array(

</span></span></pre></div>

<a id="trunktestsphpunittestsmultisitesiteDetailsphp"></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/multisite/siteDetails.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/siteDetails.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/multisite/siteDetails.php 2020-01-29 00:43:23 UTC (rev 47122)

</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">                        $site = get_site( $id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Trigger retrieving site details (post_count is not set on new sites)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Trigger retrieving site details (post_count is not set on new sites).

</ins><span class="cx" style="display: block; padding: 0 10px">                         $post_count = $site->post_count;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $cached_details = wp_cache_get( $site->id, 'site-details' );

</span></span></pre></div>

<a id="trunktestsphpunittestsmultisitesiteQueryphp"></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/multisite/siteQuery.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/siteQuery.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/multisite/siteQuery.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -442,7 +442,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEmpty( $found );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // archived, mature, spam, deleted, public

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // archived, mature, spam, deleted, public.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                public function test_wp_site_query_by_archived() {

</span><span class="cx" style="display: block; padding: 0 10px">                        $q     = new WP_Site_Query();

</span></span></pre></div>

<a id="trunktestsphpunittestsmultisitephp"></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/multisite.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/multisite.php     2020-01-29 00:43:23 UTC (rev 47122)

</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">                        wpmu_log_new_registrations( 1, 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">-                        // currently there is no wrapper function for the registration_log

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Currently there is no wrapper function for the registration_log.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $reg_blog = $wpdb->get_col( $wpdb->prepare( "SELECT email FROM {$wpdb->registration_log} WHERE {$wpdb->registration_log}.blog_id = 1 AND IP LIKE %s", $ip ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $user->user_email, $reg_blog[ count( $reg_blog ) - 1 ] );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,7 +39,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                 * @ticket 37392

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                function test_wp_count_sites() {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // create a random number of sites with each status.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Create a random number of sites with each status.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $site_ids = array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'public'   => self::factory()->blog->create_many(

</span><span class="cx" style="display: block; padding: 0 10px">                                        random_int( 0, 5 ),

</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">                                array( 'all' => array_sum( $counts_by_status ) ),

</span><span class="cx" style="display: block; padding: 0 10px">                                $counts_by_status

</span><span class="cx" style="display: block; padding: 0 10px">                        );

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // add 1 to all & public for the main site.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Add 1 to all & public for the main site.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $expected['all']    += 1;

</span><span class="cx" style="display: block; padding: 0 10px">                        $expected['public'] += 1;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunktestsphpunittestsoembedpostEmbedUrlphp"></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/oembed/postEmbedUrl.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/oembed/postEmbedUrl.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/oembed/postEmbedUrl.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -89,7 +89,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_static_front_page_conflicts_with_embed_slug() {

</span><span class="cx" style="display: block; padding: 0 10px">                $this->set_permalink_structure( '/%postname%/' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Create a post with the 'embed' post_name

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create a post with the 'embed' post_name.

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_filter( 'wp_unique_post_slug', array( $this, 'filter_unique_post_slug' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $post_embed_slug = self::factory()->post->create( array( 'post_name' => 'embed' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                remove_filter( 'wp_unique_post_slug', array( $this, 'filter_unique_post_slug' ) );

</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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/option/multisite.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,7 +31,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $value2 = __FUNCTION__ . '_val2';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertFalse( get_blog_option( 1, 'doesnotexist' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertFalse( get_option( 'doesnotexist' ) ); // check get_option()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertFalse( get_option( 'doesnotexist' ) );           // Check get_option().

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertTrue( add_blog_option( 1, $key, $value ) );

<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="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,27 +38,27 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $value, get_blog_option( 1, $key ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $value, get_blog_option( null, $key ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $value, get_blog_option( '1', $key ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $value, get_option( $key ) ); // check get_option()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertEquals( $value, get_option( $key ) );            // Check get_option().

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertFalse( add_blog_option( 1, $key, $value ) );  // Already exists

-                       $this->assertFalse( update_blog_option( 1, $key, $value ) );  // Value is the same

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertFalse( add_blog_option( 1, $key, $value ) );     // Already exists.

+                       $this->assertFalse( update_blog_option( 1, $key, $value ) );  // Value is the same.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertTrue( update_blog_option( 1, $key, $value2 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $value2, get_blog_option( 1, $key ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $value2, get_option( $key ) ); // check get_option()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertEquals( $value2, get_option( $key ) );           // Check get_option().

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertFalse( add_blog_option( 1, $key, $value ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $value2, get_blog_option( 1, $key ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $value2, get_option( $key ) ); // check get_option()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertEquals( $value2, get_option( $key ) );           // Check get_option().

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertTrue( delete_blog_option( 1, $key ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertFalse( get_blog_option( 1, $key ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertFalse( get_option( $key ) ); // check get_option()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertFalse( get_option( $key ) );                     // Check get_option().

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertFalse( delete_blog_option( 1, $key ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertTrue( update_blog_option( 1, $key2, $value2 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $value2, get_blog_option( 1, $key2 ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $value2, get_option( $key2 ) ); // check get_option()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertEquals( $value2, get_option( $key2 ) );          // Check get_option().

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertTrue( delete_blog_option( 1, $key2 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertFalse( get_blog_option( 1, $key2 ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertFalse( get_option( $key2 ) ); // check get_option()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertFalse( get_option( $key2 ) );                    // Check get_option().

</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">                function test_from_same_site_with_null_blog_id() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -68,33 +68,33 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $value2 = __FUNCTION__ . '_val2';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertFalse( get_blog_option( null, 'doesnotexist' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertFalse( get_option( 'doesnotexist' ) ); // check get_option()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertFalse( get_option( 'doesnotexist' ) );              // Check get_option().

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertTrue( add_blog_option( null, $key, $value ) );

<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->assertEquals( $value, get_blog_option( null, $key ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $value, get_blog_option( null, $key ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $value, get_option( $key ) ); // check get_option()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertEquals( $value, get_option( $key ) );               // Check get_option().

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertFalse( add_blog_option( null, $key, $value ) );  // Already exists

-                       $this->assertFalse( update_blog_option( null, $key, $value ) );  // Value is the same

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertFalse( add_blog_option( null, $key, $value ) );     // Already exists.

+                       $this->assertFalse( update_blog_option( null, $key, $value ) );  // Value is the same.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertTrue( update_blog_option( null, $key, $value2 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $value2, get_blog_option( null, $key ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $value2, get_option( $key ) ); // check get_option()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertEquals( $value2, get_option( $key ) );              // Check get_option().

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertFalse( add_blog_option( null, $key, $value ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $value2, get_blog_option( null, $key ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $value2, get_option( $key ) ); // check get_option()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertEquals( $value2, get_option( $key ) );              // Check get_option().

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertTrue( delete_blog_option( null, $key ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertFalse( get_blog_option( null, $key ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertFalse( get_option( $key ) ); // check get_option()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertFalse( get_option( $key ) );                        // Check get_option().

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertFalse( delete_blog_option( null, $key ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertTrue( update_blog_option( null, $key2, $value2 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $value2, get_blog_option( null, $key2 ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $value2, get_option( $key2 ) ); // check get_option()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertEquals( $value2, get_option( $key2 ) );             // Check get_option().

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertTrue( delete_blog_option( null, $key2 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertFalse( get_blog_option( null, $key2 ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertFalse( get_option( $key2 ) ); // check get_option()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertFalse( get_option( $key2 ) );                       // Check get_option().

</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">                function test_with_another_site() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,33 +115,33 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $value2 = __FUNCTION__ . '_val2';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertFalse( get_blog_option( $blog_id, 'doesnotexist' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        //$this->assertFalse( get_option( 'doesnotexist' ) ); // check get_option()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // $this->assertFalse( get_option( 'doesnotexist' ) );               // Check get_option().

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertTrue( add_blog_option( $blog_id, $key, $value ) );

<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->assertEquals( $value, get_blog_option( $blog_id, $key ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $value, get_blog_option( "$blog_id", $key ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        //$this->assertEquals( $value, get_option( $key ) ); // check get_option()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // $this->assertEquals( $value, get_option( $key ) );                // Check get_option().

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertFalse( add_blog_option( $blog_id, $key, $value ) );  // Already exists

-                       $this->assertFalse( update_blog_option( $blog_id, $key, $value ) );  // Value is the same

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertFalse( add_blog_option( $blog_id, $key, $value ) );     // Already exists.

+                       $this->assertFalse( update_blog_option( $blog_id, $key, $value ) );  // Value is the same.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertTrue( update_blog_option( $blog_id, $key, $value2 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $value2, get_blog_option( $blog_id, $key ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        //$this->assertEquals( $value2, get_option( $key ) ); // check get_option()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // $this->assertEquals( $value2, get_option( $key ) );               // Check get_option().

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertFalse( add_blog_option( $blog_id, $key, $value ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $value2, get_blog_option( $blog_id, $key ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        //$this->assertEquals( $value2, get_option( $key ) ); // check get_option()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // $this->assertEquals( $value2, get_option( $key ) );               // Check get_option().

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertTrue( delete_blog_option( $blog_id, $key ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertFalse( get_blog_option( $blog_id, $key ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        //$this->assertFalse( get_option( $key ) ); // check get_option()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // $this->assertFalse( get_option( $key ) );                         // Check get_option().

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertFalse( delete_blog_option( $blog_id, $key ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertTrue( update_blog_option( $blog_id, $key2, $value2 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $value2, get_blog_option( $blog_id, $key2 ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        //$this->assertEquals( $value2, get_option( $key2 ) ); // check get_option()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // $this->assertEquals( $value2, get_option( $key2 ) );              // Check get_option().

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertTrue( delete_blog_option( $blog_id, $key2 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertFalse( get_blog_option( $blog_id, $key2 ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        //$this->assertFalse( get_option( $key2 ) ); // check get_option()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // $this->assertFalse( get_option( $key2 ) );                        // Check get_option().

</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="trunktestsphpunittestsoptionoptionphp"></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/option.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/option/option.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/option/option.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,8 +18,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( get_option( 'doesnotexist' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( add_option( $key, $value ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $value, get_option( $key ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertFalse( add_option( $key, $value ) );  // Already exists

-               $this->assertFalse( update_option( $key, $value ) );  // Value is the same

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertFalse( add_option( $key, $value ) );    // Already exists.

+               $this->assertFalse( update_option( $key, $value ) ); // Value is the same.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( update_option( $key, $value2 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $value2, get_option( $key ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( add_option( $key, $value ) );

</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->assertEquals( $value, get_option( 'doesnotexist', 'foo' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                remove_filter( 'default_option_doesnotexist', array( $this, '__return_foo' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Cleanup

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Cleanup.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( delete_option( 'doesnotexist' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( get_option( 'doesnotexist' ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span></span></pre></div>

<a id="trunktestsphpunittestsoptionsiteOptionphp"></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/siteOption.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/option/siteOption.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/option/siteOption.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -133,7 +133,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $value, get_site_option( $key ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // #15497 - ensure update_site_option will add options with false-y values

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**

+        * Ensure update_site_option() will add options with false-y values.

+        *

+        * @ticket 15497

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_update_adds_falsey_value() {

</span><span class="cx" style="display: block; padding: 0 10px">                $key   = __FUNCTION__;

</span><span class="cx" style="display: block; padding: 0 10px">                $value = 0;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -140,11 +144,15 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                delete_site_option( $key );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( update_site_option( $key, $value ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->flush_cache(); // ensure we're getting the value from the DB

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->flush_cache(); // Ensure we're getting the value from the DB.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $value, get_site_option( $key ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // #18955 - ensure get_site_option doesn't cache the default value for non-existent options

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**

+        * Ensure get_site_option() doesn't cache the default value for non-existent options.

+        *

+        * @ticket 18955

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_get_doesnt_cache_default_value() {

</span><span class="cx" style="display: block; padding: 0 10px">                $option  = __FUNCTION__;

</span><span class="cx" style="display: block; padding: 0 10px">                $default = 'a default';

</span></span></pre></div>

<a id="trunktestsphpunittestsoptionslashesphp"></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/slashes.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/option/slashes.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/option/slashes.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,8 +8,8 @@

</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Option_Slashes extends WP_UnitTestCase {

</span><span class="cx" style="display: block; padding: 0 10px">        function setUp() {

</span><span class="cx" style="display: block; padding: 0 10px">                parent::setUp();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // it is important to test with both even and odd numbered slashes as

-               // kses does a strip-then-add slashes in some of its function calls

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // It is important to test with both even and odd numbered slashes,

+               // as KSES does a strip-then-add slashes in some of its function calls.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->slash_1 = 'String with 1 slash \\';

</span><span class="cx" style="display: block; padding: 0 10px">                $this->slash_2 = 'String with 2 slashes \\\\';

</span><span class="cx" style="display: block; padding: 0 10px">                $this->slash_3 = 'String with 3 slashes \\\\\\';

</span></span></pre></div>

<a id="trunktestsphpunittestsoptiontransientphp"></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/transient.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/option/transient.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/option/transient.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -93,27 +93,27 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 30380

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_nonexistent_key_dont_delete_if_false() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Create a bogus a transient

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create a bogus a transient.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $key = 'test_transient';

</span><span class="cx" style="display: block; padding: 0 10px">                set_transient( $key, 'test', 60 * 10 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'test', get_transient( $key ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Useful variables for tracking

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Useful variables for tracking.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $transient_timeout = '_transient_timeout_' . $key;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Mock an action for tracking action calls

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Mock an action for tracking action calls.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $a = new MockAction();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make sure the timeout option returns false

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure the timeout option returns false.

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_filter( 'option_' . $transient_timeout, '__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">-                // Add some actions to make sure options are _not_ deleted

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Add some actions to make sure options are _not_ deleted.

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_action( 'delete_option', array( $a, 'action' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Act

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Act.

</ins><span class="cx" style="display: block; padding: 0 10px">                 get_transient( $key );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make sure delete option was not called for both the transient and the timeout

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure 'delete_option' was not called for both the transient and the timeout.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 0, $a->get_call_count() );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -121,26 +121,26 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 30380

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_nonexistent_key_old_timeout() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Create a transient

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create a transient.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $key = 'test_transient';

</span><span class="cx" style="display: block; padding: 0 10px">                set_transient( $key, 'test', 60 * 10 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'test', get_transient( $key ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make sure the timeout option returns false

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure the timeout option returns false.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $timeout          = '_transient_timeout_' . $key;

</span><span class="cx" style="display: block; padding: 0 10px">                $transient_option = '_transient_' . $key;

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'option_' . $timeout, '__return_zero' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Mock an action for tracking action calls

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Mock an action for tracking action calls.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $a = new MockAction();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Add some actions to make sure options are deleted

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Add some actions to make sure options are deleted.

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_action( 'delete_option', array( $a, 'action' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Act

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Act.

</ins><span class="cx" style="display: block; padding: 0 10px">                 get_transient( $key );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make sure delete option was called for both the transient and the timeout

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure 'delete_option' was called for both the transient and the timeout.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 2, $a->get_call_count() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = array(

</span></span></pre></div>

<a id="trunktestsphpunittestsoptionuserSettingsphp"></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/userSettings.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/option/userSettings.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/option/userSettings.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,7 +50,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'foobarbaz', get_user_setting( 'foo' ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // set_user_setting bails if `headers_sent()` is true

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // set_user_setting() bails if `headers_sent()` is true.

</ins><span class="cx" style="display: block; padding: 0 10px">         function set_user_setting( $name, $value ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $all_user_settings          = get_all_user_settings();

</span><span class="cx" style="display: block; padding: 0 10px">                $all_user_settings[ $name ] = $value;

</span></span></pre></div>

<a id="trunktestsphpunittestspluggablephp"></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/pluggable.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/pluggable.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/pluggable.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -88,7 +88,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'wp-includes/pluggable.php',

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Pluggable function signatures are not tested when an external object cache is in use. #31491

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Pluggable function signatures are not tested when an external object cache is in use. See #31491.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! wp_using_ext_object_cache() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $test_files[] = 'wp-includes/cache.php';

</span><span class="cx" style="display: block; padding: 0 10px">                }

</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">                        'install_global_terms'            => array(),

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Pluggable function signatures are not tested when an external object cache is in use. #31491

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Pluggable function signatures are not tested when an external object cache is in use. See #31491.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! wp_using_ext_object_cache() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $signatures = array_merge(

</span><span class="cx" style="display: block; padding: 0 10px">                                $signatures,

</span></span></pre></div>

<a id="trunktestsphpunittestspomopluralFormsphp"></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/pomo/pluralForms.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/pomo/pluralForms.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/pomo/pluralForms.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -110,7 +110,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                ),

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</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">-                                // Ternary

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Ternary.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'n ? 1 : 2',

</span><span class="cx" style="display: block; padding: 0 10px">                                array(

</span><span class="cx" style="display: block; padding: 0 10px">                                        -1 => 1,

</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">                                ),

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</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">-                                // Comparison

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Comparison.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'n > 1 ? 1 : 2',

</span><span class="cx" style="display: block; padding: 0 10px">                                array(

</span><span class="cx" style="display: block; padding: 0 10px">                                        -2 => 2,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -163,9 +163,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function data_exceptions() {

</span><span class="cx" style="display: block; padding: 0 10px">                return array(

</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">-                                'n # 2',              // Invalid expression to parse

-                               'Unknown symbol "#"', // Expected exception message

-                               false,                // Whether to call the get() method or not

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         'n # 2',              // Invalid expression to parse.

+                               'Unknown symbol "#"', // Expected exception message.

+                               false,                // Whether to call the get() method or not.

</ins><span class="cx" style="display: block; padding: 0 10px">                         ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'n & 1',

</span></span></pre></div>

<a id="trunktestsphpunittestspomopophp"></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/pomo/po.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/pomo/po.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/pomo/po.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,7 +7,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function setUp() {

</span><span class="cx" style="display: block; padding: 0 10px">                parent::setUp();

</span><span class="cx" style="display: block; padding: 0 10px">                require_once ABSPATH . '/wp-includes/pomo/po.php';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // not so random wordpress.pot string -- multiple lines

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Not so random wordpress.pot string -- multiple lines.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->mail    = 'Your new WordPress blog has been successfully set up at:

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> %1$s

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,17 +50,17 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_poify() {

</span><span class="cx" style="display: block; padding: 0 10px">                $po = new PO();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //simple

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Simple.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( '"baba"', $po->poify( 'baba' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //long word

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Long word.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $this->po_a90, $po->poify( $this->a90 ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // tab

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Tab.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( '"ba\tba"', $po->poify( "ba\tba" ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // do not add leading empty string of one-line string ending on a newline

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Do not add leading empty string of one-line string ending on a newline.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( '"\\\\a\\\\n\\n"', $po->poify( "\a\\n\n" ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // backslash

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Backslash.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( '"ba\\\\ba"', $po->poify( 'ba\\ba' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // random wordpress.pot string

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Random wordpress.pot string.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $src = 'Categories can be selectively converted to tags using the <a href="%s">category to tag converter</a>.';

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( '"Categories can be selectively converted to tags using the <a href=\\"%s\\">category to tag converter</a>."', $po->poify( $src ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,7 +73,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( "baba\ngugu", $po->unpoify( '"baba\n"' . "\t\t\t\n" . '"gugu"' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $this->a90, $po->unpoify( $this->po_a90 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( '\\t\\n', $po->unpoify( '"\\\\t\\\\n"' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // wordwrapped

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Wordwrapped.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 'babadyado', $po->unpoify( "\"\"\n\"baba\"\n\"dyado\"" ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEqualsIgnoreEOL( $this->mail, $po->unpoify( $this->po_mail ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,7 +82,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $po    = new PO();

</span><span class="cx" style="display: block; padding: 0 10px">                $entry = new Translation_Entry( array( 'singular' => 'baba' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( "msgid \"baba\"\nmsgstr \"\"", $po->export_entry( $entry ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // plural

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Plural.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $entry = new Translation_Entry(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'singular' => 'baba',

</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"> msgstr[2] "бабаяга"',

</span><span class="cx" style="display: block; padding: 0 10px">                        $po->export_entry( $entry )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // context

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Context.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $entry = new Translation_Entry(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'context'      => 'ctxt',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -320,6 +320,6 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 1, count( $po->entries ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        //TODO: add tests for bad files

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // TODO: Add tests for bad files.

</ins><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="trunktestsphpunittestspomotranslationEntryphp"></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/pomo/translationEntry.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/pomo/translationEntry.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/pomo/translationEntry.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,12 +6,12 @@

</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_POMO_TranslationEntry extends WP_UnitTestCase {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_create_entry() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // no singular => empty object

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // No singular => empty object.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $entry = new Translation_Entry();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNull( $entry->singular );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNull( $entry->plural );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $entry->is_plural );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // args -> members

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // args -> members.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $entry = new Translation_Entry(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'singular'     => 'baba',

</span></span></pre></div>

<a id="trunktestsphpunittestspomotranslationsphp"></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/pomo/translations.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/pomo/translations.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/pomo/translations.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,8 +12,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $po     = new Translations();

</span><span class="cx" style="display: block; padding: 0 10px">                $po->add_entry( $entry );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array( $entry->key() => $entry ), $po->entries );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // add the same entry more than once

-               // we do not need to test proper key generation here, see test_key()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Add the same entry more than once.

+               // We do not need to test proper key generation here, see test_key().

</ins><span class="cx" style="display: block; padding: 0 10px">                 $po->add_entry( $entry );

</span><span class="cx" style="display: block; padding: 0 10px">                $po->add_entry( $entry );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array( $entry->key() => $entry ), $po->entries );

</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">                        $po->entries

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // add empty entry

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Add empty entry.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( false, $po->add_entry( $empty ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</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">                        $po->entries

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // give add_entry() the arguments and let it create the entry itself

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Give add_entry() the arguments and let it create the entry itself.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $po = new Translations();

</span><span class="cx" style="display: block; padding: 0 10px">                $po->add_entry( array( 'singular' => 'baba' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $entries = array_values( $po->entries );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -93,12 +93,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $domain->add_entry( $entry_2 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'other', $domain->translate_plural( 'other', 'others', 1 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'others', $domain->translate_plural( 'other', 'others', 111 ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // too few translations + cont logic

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Too few translations + cont logic.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 'babas', $domain->translate_plural( 'baba', 'babas', 2 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'babas', $domain->translate_plural( 'baba', 'babas', 0 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'babas', $domain->translate_plural( 'baba', 'babas', -1 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'babas', $domain->translate_plural( 'baba', 'babas', 999 ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // proper

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Proper.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 'dyadox', $domain->translate_plural( 'dyado', 'dyados', 1 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'dyadoy', $domain->translate_plural( 'dyado', 'dyados', 0 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'dyadoy', $domain->translate_plural( 'dyado', 'dyados', 18881 ) );

</span></span></pre></div>

<a id="trunktestsphpunittestspostattachmentsphp"></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/attachments.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/attachments.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/post/attachments.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,7 +23,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_insert_image_no_thumb() {

</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 image is smaller than the thumbnail size so it won't have one

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // This image is smaller than the thumbnail size so it won't have one.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $filename = ( DIR_TESTDATA . '/images/test-image.jpg' );

</span><span class="cx" style="display: block; padding: 0 10px">                $contents = file_get_contents( $filename );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,12 +32,12 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $id = $this->_make_attachment( $upload );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // intermediate copies should not exist

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Intermediate copies should not exist.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( image_get_intermediate_size( $id, 'thumbnail' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( image_get_intermediate_size( $id, 'medium' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( image_get_intermediate_size( $id, 'medium_large' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // medium, medium_large, and full size will both point to the original

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // medium, medium_large, and full size will both point to the original.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $downsize = image_downsize( $id, 'medium' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( wp_basename( $upload['file'] ), wp_basename( $downsize[0] ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 50, $downsize[1] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,7 +71,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $id = $this->_make_attachment( $upload );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // intermediate copies should exist: thumbnail only

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Intermediate copies should exist: thumbnail only.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $thumb = image_get_intermediate_size( $id, 'thumbnail' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'a2-small-150x150.jpg', $thumb['file'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,16 +81,16 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( image_get_intermediate_size( $id, 'medium' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( image_get_intermediate_size( $id, 'medium_large' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // the thumb url should point to the thumbnail intermediate

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // The thumb url should point to the thumbnail intermediate.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $thumb['url'], wp_get_attachment_thumb_url( $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">-                // image_downsize() should return the correct images and sizes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // image_downsize() should return the correct images and sizes.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $downsize = image_downsize( $id, 'thumbnail' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'a2-small-150x150.jpg', wp_basename( $downsize[0] ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 150, $downsize[1] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 150, $downsize[2] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // medium, medium_large, and full will both point to the original

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // medium, medium_large, and full will both point to the original.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $downsize = image_downsize( $id, 'medium' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'a2-small.jpg', wp_basename( $downsize[0] ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 400, $downsize[1] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,7 +128,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $id      = $this->_make_attachment( $upload );

</span><span class="cx" style="display: block; padding: 0 10px">                $uploads = wp_upload_dir();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // intermediate copies should exist: thumbnail and medium

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Intermediate copies should exist: thumbnail and medium.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $thumb = image_get_intermediate_size( $id, 'thumbnail' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( '2007-06-17DSC_4173-150x150.jpg', $thumb['file'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( is_file( $uploads['basedir'] . DIRECTORY_SEPARATOR . $thumb['path'] ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -141,10 +141,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( '2007-06-17DSC_4173-600x904.jpg', $medium_large['file'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( is_file( $uploads['basedir'] . DIRECTORY_SEPARATOR . $medium_large['path'] ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // the thumb url should point to the thumbnail intermediate

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // The thumb url should point to the thumbnail intermediate.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $thumb['url'], wp_get_attachment_thumb_url( $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">-                // image_downsize() should return the correct images and sizes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // image_downsize() should return the correct images and sizes.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $downsize = image_downsize( $id, 'thumbnail' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( '2007-06-17DSC_4173-150x150.jpg', wp_basename( $downsize[0] ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 150, $downsize[1] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -187,7 +187,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $id      = $this->_make_attachment( $upload );

</span><span class="cx" style="display: block; padding: 0 10px">                $uploads = wp_upload_dir();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // check that the file and intermediates exist

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check that the file and intermediates exist.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $thumb = image_get_intermediate_size( $id, 'thumbnail' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( '2007-06-17DSC_4173-150x150.jpg', $thumb['file'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( is_file( $uploads['basedir'] . DIRECTORY_SEPARATOR . $thumb['path'] ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -204,7 +204,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $original = $meta['file'];

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( is_file( $uploads['basedir'] . DIRECTORY_SEPARATOR . $original ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // now delete the attachment and make sure all files are gone

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Now delete the attachment and make sure all files are gone.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_delete_attachment( $id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( is_file( $thumb['path'] ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -220,7 +220,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 21963

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_insert_image_without_guid() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // this image is smaller than the thumbnail size so it won't have one

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // This image is smaller than the thumbnail size so it won't have one.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $filename = ( DIR_TESTDATA . '/images/test-image.jpg' );

</span><span class="cx" style="display: block; padding: 0 10px">                $contents = file_get_contents( $filename );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -272,7 +272,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $attachment_id = $this->_make_attachment( $upload );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Assert that the attachment is an orphan

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Assert that the attachment is an orphan.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $attachment = get_post( $attachment_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $attachment->post_parent, 0 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -283,7 +283,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">-                // Assert that the attachment has a parent

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Assert that the attachment has a parent.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_insert_attachment( $attachment, '', $post_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $attachment = get_post( $attachment_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $attachment->post_parent, $post_id );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -352,7 +352,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $upload = wp_upload_bits( wp_basename( $filename ), null, $contents );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( empty( $upload['error'] ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set attachment ID

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set attachment ID.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $attachment_id = $this->_make_attachment( $upload );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $_SERVER['HTTPS'] = 'on';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -408,7 +408,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $upload = wp_upload_bits( wp_basename( $filename ), null, $contents );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( empty( $upload['error'] ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set attachment ID

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set attachment ID.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $attachment_id = $this->_make_attachment( $upload );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $_SERVER['HTTPS'] = 'on';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -426,7 +426,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 15928

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_wp_get_attachment_url_should_force_https_when_administering_over_https_and_siteurl_is_https() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set https upload URL

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set https upload URL.

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_filter( 'upload_dir', '_upload_dir_https' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $filename = ( DIR_TESTDATA . '/images/test-image.jpg' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -435,7 +435,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $upload = wp_upload_bits( wp_basename( $filename ), null, $contents );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( empty( $upload['error'] ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set attachment ID

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set attachment ID.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $attachment_id = $this->_make_attachment( $upload );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $_SERVER['HTTPS'] = 'on';

</span></span></pre></div>

<a id="trunktestsphpunittestspostfilteringphp"></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/filtering.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/filtering.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/post/filtering.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,9 +1,11 @@

</span><span class="cx" style="display: block; padding: 0 10px"> <?php

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// save and fetch posts to make sure content is properly filtered.

-// these tests don't care what code is responsible for filtering or how it is called, just that it happens when a post is saved.

-

</del><span class="cx" style="display: block; padding: 0 10px"> /**

<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Save and fetch posts to make sure content is properly filtered.

+ *

+ * These tests don't care what code is responsible for filtering

+ * or how it is called, just that it happens when a post is saved.

+ *

</ins><span class="cx" style="display: block; padding: 0 10px">  * @group post

</span><span class="cx" style="display: block; padding: 0 10px">  * @group formatting

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,7 +22,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                parent::tearDown();

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // a simple test to make sure unclosed tags are fixed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // A simple test to make sure unclosed tags are fixed.

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_post_content_unknown_tag() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $content = <<<EOF

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,7 +39,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected, $post->post_content );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // a simple test to make sure unbalanced tags are fixed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // A simple test to make sure unbalanced tags are fixed.

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_post_content_unbalanced_tag() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $content = <<<EOF

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,7 +56,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected, $post->post_content );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // test kses filtering of disallowed attribute

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Test KSES filtering of disallowed attribute.

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_post_content_disallowed_attr() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $content = <<<EOF

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,7 +93,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected, $post->post_content );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // make sure unbalanced tags are untouched when the balance option is off

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Make sure unbalanced tags are untouched when the balance option is off.

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_post_content_nobalance_nextpage_more() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'use_balanceTags', 0 );

</span></span></pre></div>

<a id="trunktestsphpunittestspostformatsphp"></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/formats.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/formats.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/post/formats.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -87,10 +87,10 @@

<span class="cx" style="display: block; padding: 0 10px">                // Standard is a special case. It shows as false when set.

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( has_post_format( 'standard', $post_id ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Dummy format type

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Dummy format type.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( has_post_format( 'dummy', $post_id ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Dummy post id

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Dummy post ID.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( has_post_format( 'aside', 12345 ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -133,7 +133,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $content_link = get_url_in_content( get_post_field( 'post_content', $comm_post_id ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( false, $content_link );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Now with an href

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Now with an href.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $href_post_id = self::factory()->post->create( array( 'post_content' => $href ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $content_link = get_url_in_content( get_post_field( 'post_content', $href_post_id ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $link, $content_link );

</span></span></pre></div>

<a id="trunktestsphpunittestspostgetPageUriphp"></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/getPageUri.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/getPageUri.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/post/getPageUri.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,13 +40,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // check the parent for good measure

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check the parent for good measure.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 'parent', get_page_uri( $parent_id ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // try the child normally

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Try the child normally.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 'parent/child', get_page_uri( $child_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">-                // now delete the parent from the database and check

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Now delete the parent from the database and check.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_delete_post( $parent_id, true );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'child', get_page_uri( $child_id ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span></span></pre></div>

<a id="trunktestsphpunittestspostgetPagesphp"></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/getPages.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/getPages.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/post/getPages.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -420,7 +420,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $pages              = get_pages(); // Defaults: hierarchical = true, parent = -1

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $pages              = get_pages(); // Defaults: hierarchical = true, parent = -1.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $pages_default_args = get_pages(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'hierarchical' => true,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -464,7 +464,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">-                $pages        = get_pages(); // Defaults: hierarchical = true, child_of = '', parent = -1

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $pages        = get_pages(); // Defaults: hierarchical = true, child_of = '', parent = -1.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $default_args = get_pages(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'hierarchical' => true,

</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">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $pages = get_pages( array( 'hierarchical' => false ) ); // child_of = '', parent = -1

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $pages = get_pages( array( 'hierarchical' => false ) ); // child_of = '', parent = -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">                 * Page tree:

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -713,13 +713,13 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $num_queries = $wpdb->num_queries;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $pages = get_pages(); // Database gets queried

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $pages = get_pages(); // Database gets queried.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $num_queries + 1, $wpdb->num_queries );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $num_queries = $wpdb->num_queries;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $pages = get_pages(); // Database should not get queried

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $pages = get_pages(); // Database should not get queried.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $num_queries, $wpdb->num_queries );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span></span></pre></div>

<a id="trunktestsphpunittestspostmetaphp"></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/meta.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/meta.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/post/meta.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -45,23 +45,23 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_unique_postmeta() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Add a unique post meta item

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Add a unique post meta item.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertInternalType( 'integer', add_post_meta( self::$post_id, 'unique', 'value', 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">-                // Check unique is enforced

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check unique is enforced.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( add_post_meta( self::$post_id, 'unique', 'another value', 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">-                //Check it exists

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check it exists.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 'value', get_post_meta( self::$post_id, 'unique', true ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array( 'value' ), get_post_meta( self::$post_id, 'unique', 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">-                //Fail to delete the wrong value

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Fail to delete the wrong value.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( delete_post_meta( self::$post_id, 'unique', 'wrong value' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //Delete it

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Delete it.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( delete_post_meta( self::$post_id, 'unique', 'value' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //Check it is deleted

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check it is deleted.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( '', get_post_meta( self::$post_id, 'unique', true ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array(), get_post_meta( self::$post_id, 'unique', false ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -68,28 +68,28 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_nonunique_postmeta() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Add two non unique post meta item

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Add two non-unique post meta items.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertInternalType( 'integer', add_post_meta( self::$post_id, 'nonunique', 'value' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'integer', add_post_meta( self::$post_id, 'nonunique', 'another value' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //Check they exists

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check they exist.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 'value', get_post_meta( self::$post_id, 'nonunique', true ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array( 'value', 'another value' ), get_post_meta( self::$post_id, 'nonunique', 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">-                //Fail to delete the wrong value

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Fail to delete the wrong value.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( delete_post_meta( self::$post_id, 'nonunique', 'wrong value' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //Delete the first one

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Delete the first one.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( delete_post_meta( self::$post_id, 'nonunique', 'value' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //Check the remainder exists

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check the remainder exists.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 'another value', get_post_meta( self::$post_id, 'nonunique', true ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array( 'another value' ), get_post_meta( self::$post_id, 'nonunique', 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">-                //Add a third one

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Add a third one.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertInternalType( 'integer', add_post_meta( self::$post_id, 'nonunique', 'someother value' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //Check they exists

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check they exist.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $expected = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'someother value',

</span><span class="cx" style="display: block; padding: 0 10px">                        'another value',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,30 +100,30 @@

</span><span class="cx" style="display: block; padding: 0 10px">                sort( $actual );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected, $actual );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //Delete the lot

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Delete the lot.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( delete_post_meta_by_key( 'nonunique' ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_update_post_meta() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Add a unique post meta item

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Add a unique post meta item.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertInternalType( 'integer', add_post_meta( self::$post_id, 'unique_update', 'value', 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">-                // Add two non unique post meta item

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Add two non-unique post meta items.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertInternalType( 'integer', add_post_meta( self::$post_id, 'nonunique_update', 'value' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'integer', add_post_meta( self::$post_id, 'nonunique_update', 'another value' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //Check they exists

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check they exist.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 'value', get_post_meta( self::$post_id, 'unique_update', true ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array( 'value' ), get_post_meta( self::$post_id, 'unique_update', false ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'value', get_post_meta( self::$post_id, 'nonunique_update', true ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array( 'value', 'another value' ), get_post_meta( self::$post_id, 'nonunique_update', 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">-                // Update them

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Update them.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( update_post_meta( self::$post_id, 'unique_update', 'new', 'value' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( update_post_meta( self::$post_id, 'nonunique_update', 'new', 'value' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( update_post_meta( self::$post_id, 'nonunique_update', 'another new', 'another value' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //Check they updated

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check they updated.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 'new', get_post_meta( self::$post_id, 'unique_update', true ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array( 'new' ), get_post_meta( self::$post_id, 'unique_update', false ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'new', get_post_meta( self::$post_id, 'nonunique_update', true ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -132,35 +132,35 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_delete_post_meta() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Add a unique post meta item

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Add two unique post meta items.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertInternalType( 'integer', add_post_meta( self::$post_id, 'unique_delete', 'value', true ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'integer', add_post_meta( self::$post_id_2, 'unique_delete', 'value', 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">-                //Check they exists

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check they exist.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 'value', get_post_meta( self::$post_id, 'unique_delete', true ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'value', get_post_meta( self::$post_id_2, 'unique_delete', 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">-                //Delete one of them

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Delete one of them.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( delete_post_meta( self::$post_id, 'unique_delete', 'value' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //Check the other still exitsts

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check the other still exists.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 'value', get_post_meta( self::$post_id_2, 'unique_delete', true ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_delete_post_meta_by_key() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Add a unique post meta item

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Add two unique post meta items.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertInternalType( 'integer', add_post_meta( self::$post_id, 'unique_delete_by_key', 'value', true ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'integer', add_post_meta( self::$post_id_2, 'unique_delete_by_key', 'value', 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">-                //Check they exist

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check they exist.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 'value', get_post_meta( self::$post_id, 'unique_delete_by_key', true ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'value', get_post_meta( self::$post_id_2, 'unique_delete_by_key', 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">-                //Delete one of them

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Delete one of them.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( delete_post_meta_by_key( 'unique_delete_by_key' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //Check the other still exists

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check the other still exists.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( '', get_post_meta( self::$post_id_2, 'unique_delete_by_key', true ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( '', get_post_meta( self::$post_id_2, 'unique_delete_by_key', true ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -196,31 +196,31 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_update_meta() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Add a unique post meta item

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Add a unique post meta item.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertInternalType( 'integer', $mid1 = add_post_meta( self::$post_id, 'unique_update', 'value', 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">-                // Add two non unique post meta item

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Add two non-unique post meta items.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertInternalType( 'integer', $mid2 = add_post_meta( self::$post_id, 'nonunique_update', 'value' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'integer', $mid3 = add_post_meta( self::$post_id, 'nonunique_update', 'another value' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //Check they exist

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check they exist.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 'value', get_post_meta( self::$post_id, 'unique_update', true ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array( 'value' ), get_post_meta( self::$post_id, 'unique_update', false ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'value', get_post_meta( self::$post_id, 'nonunique_update', true ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array( 'value', 'another value' ), get_post_meta( self::$post_id, 'nonunique_update', 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">-                // Update them

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Update them.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( update_meta( $mid1, 'unique_update', 'new' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( update_meta( $mid2, 'nonunique_update', 'new' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( update_meta( $mid3, 'nonunique_update', 'another new' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //Check they updated

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check they updated.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 'new', get_post_meta( self::$post_id, 'unique_update', true ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array( 'new' ), get_post_meta( self::$post_id, 'unique_update', false ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'new', get_post_meta( self::$post_id, 'nonunique_update', true ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array( 'new', 'another new' ), get_post_meta( self::$post_id, 'nonunique_update', 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">-                // Slashed update

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Slashed update.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $data = "'quote and \slash";

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( update_meta( $mid1, 'unique_update', addslashes( $data ) ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $meta = get_metadata_by_mid( 'post', $mid1 );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -241,10 +241,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $classy->stringy = 'I love slashes\\\\ more';

</span><span class="cx" style="display: block; padding: 0 10px">                $funky_meta[]    = $classy;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Add a post meta item

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Add a post meta item.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertInternalType( 'integer', add_post_meta( self::$post_id, 'test_funky_post_meta', $funky_meta, 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">-                //Check they exists

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check it exists.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $funky_meta, get_post_meta( self::$post_id, 'test_funky_post_meta', 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="trunktestsphpunittestspostnavmenuphp"></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/nav-menu.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/nav-menu.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/post/nav-menu.php 2020-01-29 00:43:23 UTC (rev 47122)

</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">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Item without menu-item-object arg

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Item without menu-item-object arg.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post_2_insert = wp_update_nav_menu_item(

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->menu_id,

</span><span class="cx" style="display: block; padding: 0 10px">                        0,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -142,7 +142,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_orphan_nav_menu_item() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Create an orphan nav menu item

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create an orphan nav menu item.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $custom_item_id = wp_update_nav_menu_item(

</span><span class="cx" style="display: block; padding: 0 10px">                        0,

</span><span class="cx" style="display: block; padding: 0 10px">                        0,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -154,11 +154,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Confirm it saved properly

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Confirm it saved properly.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $custom_item = wp_setup_nav_menu_item( get_post( $custom_item_id ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'Wordpress.org', $custom_item->title );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Update the orphan with an associated nav menu

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Update the orphan with an associated nav menu.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_update_nav_menu_item(

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->menu_id,

</span><span class="cx" style="display: block; padding: 0 10px">                        $custom_item_id,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -225,7 +225,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 29460

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_orderby_name_by_default() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // We are going to create a random number of menus (min 2, max 10)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // We are going to create a random number of menus (min 2, max 10).

</ins><span class="cx" style="display: block; padding: 0 10px">                 $menus_no = rand( 2, 10 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                for ( $i = 0; $i <= $menus_no; $i++ ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -232,7 +232,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        wp_create_nav_menu( rand_str() );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // This is the expected array of menu names

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // This is the expected array of menu names.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $expected_nav_menus_names = wp_list_pluck(

</span><span class="cx" style="display: block; padding: 0 10px">                        get_terms(

</span><span class="cx" style="display: block; padding: 0 10px">                                'nav_menu',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -244,7 +244,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'name'

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // And this is what we got when calling wp_get_nav_menus()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // And this is what we got when calling wp_get_nav_menus().

</ins><span class="cx" style="display: block; padding: 0 10px">                 $nav_menus_names = wp_list_pluck( wp_get_nav_menus(), 'name' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $nav_menus_names, $expected_nav_menus_names );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -311,7 +311,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $post_type_archive_item    = wp_setup_nav_menu_item( get_post( $post_type_archive_item_id ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $post_type_slug, $post_type_archive_item->title );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $post_type_description, $post_type_archive_item->description ); //fail!!!

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertEquals( $post_type_description, $post_type_archive_item->description ); // Fail!

</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">@@ -459,11 +459,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // The markup should include whitespace between <li>s

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // The markup should include whitespace between <li>'s.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertRegExp( '/\s<li.*>|<\/li>\s/U', $menu );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotRegExp( '/<\/li><li.*>/U', $menu );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Whitepsace suppressed.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Whitespace suppressed.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $menu = wp_nav_menu(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'echo'         => false,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -472,7 +472,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">-                // The markup should not include whitespace around <li>s

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // The markup should not include whitespace around <li>'s.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertNotRegExp( '/\s<li.*>|<\/li>\s/U', $menu );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertRegExp( '/><li.*>|<\/li></U', $menu );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span></span></pre></div>

<a id="trunktestsphpunittestspostobjectsphp"></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/objects.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/objects.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/post/objects.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,21 +14,21 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( isset( $post->ancestors ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array(), $post->ancestors );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Unset and then verify that the magic method fills the property again

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Unset and then verify that the magic method fills the property again.

</ins><span class="cx" style="display: block; padding: 0 10px">                 unset( $post->ancestors );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array(), $post->ancestors );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Magic get should make meta accessible as properties

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Magic get should make meta accessible as properties.

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_post_meta( $id, 'test', 'test' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'test', get_post_meta( $id, 'test', true ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'test', $post->test );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make sure meta does not eclipse true properties

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure meta does not eclipse true properties.

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_post_meta( $id, 'post_type', 'dummy' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'dummy', get_post_meta( $id, 'post_type', true ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'post', $post->post_type );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Excercise the output argument

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Excercise the output argument.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post = get_post( $id, ARRAY_A );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'array', $post );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'post', $post['post_type'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,12 +44,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'post', $post['post_type'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $id, $post['ID'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Should default to OBJECT when given invalid output argument

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Should default to OBJECT when given invalid output argument.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post = get_post( $id, 'invalid-output-value' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'WP_Post', $post );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $id, $post->ID );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make sure stdClass in $GLOBALS['post'] is handled

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure stdClass in $GLOBALS['post'] is handled.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post_std = $post->to_array();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'array', $post_std );

</span><span class="cx" style="display: block; padding: 0 10px">                $post_std        = (object) $post_std;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -213,16 +213,16 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $id = self::factory()->post->create();

</span><span class="cx" style="display: block; padding: 0 10px">                wp_cache_delete( $id, 'posts' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // get_post( stdClass ) should not prime the cache

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // get_post( stdClass ) should not prime the cache.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->posts WHERE ID = %d LIMIT 1", $id ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $post = get_post( $post );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEmpty( wp_cache_get( $id, 'posts' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // get_post( WP_Post ) should not prime the cache

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // get_post( WP_Post ) should not prime the cache.

</ins><span class="cx" style="display: block; padding: 0 10px">                 get_post( $post );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEmpty( wp_cache_get( $id, 'posts' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // get_post( ID ) should prime the cache

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // get_post( ID ) should prime the cache.

</ins><span class="cx" style="display: block; padding: 0 10px">                 get_post( $post->ID );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEmpty( wp_cache_get( $id, 'posts' ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span></span></pre></div>

<a id="trunktestsphpunittestspostoutputphp"></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/output.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/output.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/post/output.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,8 +1,8 @@

</span><span class="cx" style="display: block; padding: 0 10px"> <?php

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// test the output of post template tags etc

-

</del><span class="cx" style="display: block; padding: 0 10px"> /**

<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Test the output of post template tags, etc.

+ *

</ins><span class="cx" style="display: block; padding: 0 10px">  * @group post

</span><span class="cx" style="display: block; padding: 0 10px">  * @group formatting

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -132,7 +132,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                kses_init_filters();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                // http://bpr3.org/?p=87

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // the title attribute should make it through unfiltered

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // The title attribute should make it through unfiltered.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post_content = <<<EOF

</span><span class="cx" style="display: block; padding: 0 10px"> <span class="Z3988" title="ctx_ver=Z39.88-2004&rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Ajournal&rft.aulast=Mariat&rft.aufirst=Denis&rft. au=Denis+Mariat&rft.au=Sead+Taourit&rft.au=G%C3%A9rard+Gu%C3%A9rin& rft.title=Genetics+Selection+Evolution&rft.atitle=&rft.date=2003&rft. volume=35&rft.issue=1&rft.spage=119&rft.epage=133&rft.genre=article& rft.id=info:DOI/10.1051%2Fgse%3A2002039"></span>Mariat, D., Taourit, S., GuÃ©rin, G. (2003). . <span style="font-style: italic;">Genetics Selection Evolution, 35</span>(1), 119-133. DOI: <a rev="review" href= "http://dx.doi.org/10.1051/gse:2002039">10.1051/gse:2002039</a>

</span><span class="cx" style="display: block; padding: 0 10px"> EOF;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -156,7 +156,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                kses_init_filters();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                // http://bpr3.org/?p=87

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // the title attribute should make it through unfiltered

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // The title attribute should make it through unfiltered.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post_content = <<<EOF

</span><span class="cx" style="display: block; padding: 0 10px"> <span title="My friends: Alice, Bob and Carol">foo</span>

</span><span class="cx" style="display: block; padding: 0 10px"> EOF;

</span></span></pre></div>

<a id="trunktestsphpunittestspostqueryphp"></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/query.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/query.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/post/query.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -95,19 +95,19 @@

</span><span class="cx" style="display: 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">-                // Fourth post added in filter

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Fourth post added in filter.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 4, count( $query->posts ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 4, $query->post_count );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $query->posts as $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">-                        // posts are WP_Post objects

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Posts are WP_Post objects.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertTrue( is_a( $post, 'WP_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">-                        // filters are raw

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Filters are raw.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertEquals( 'raw', $post->filter );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // custom data added in the_posts filter is preserved

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Custom data added in the_posts filter is preserved.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertEquals( array( $post->ID, 'custom data' ), $post->custom_data );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -408,31 +408,31 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 29629

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_orderby() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // 'rand' is a valid value

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // 'rand' is a valid value.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $q = new WP_Query( array( 'orderby' => 'rand' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertContains( 'ORDER BY RAND()', $q->request );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotContains( 'ASC', $q->request );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotContains( 'DESC', $q->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">-                // This isn't allowed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // This isn't allowed.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $q2 = new WP_Query( array( 'order' => 'rand' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertContains( 'ORDER BY', $q2->request );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotContains( 'RAND()', $q2->request );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertContains( 'DESC', $q2->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">-                // 'none' is a valid value

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // 'none' is a valid value.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $q3 = new WP_Query( array( 'orderby' => 'none' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotContains( 'ORDER BY', $q3->request );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotContains( 'DESC', $q3->request );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotContains( 'ASC', $q3->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">-                // false is a valid value

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // False is a valid value.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $q4 = new WP_Query( array( 'orderby' => false ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotContains( 'ORDER BY', $q4->request );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotContains( 'DESC', $q4->request );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotContains( 'ASC', $q4->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">-                // empty array() is a valid value

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Empty array() is a valid value.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $q5 = new WP_Query( array( 'orderby' => array() ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotContains( 'ORDER BY', $q5->request );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotContains( 'DESC', $q5->request );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -566,11 +566,11 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->post_id = self::factory()->post->create();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Prevent the DB query

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Prevent the DB query.

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_filter( 'posts_request', '__return_empty_string' );

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'found_posts_query', '__return_empty_string' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Add the post and found_posts

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Add the post and found_posts.

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_filter( 'the_posts', array( $this, 'filter_the_posts' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'found_posts', array( $this, 'filter_found_posts' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -690,7 +690,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">        public function set_found_posts_provider() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // count return 0 for null, but 1 for other data you may not expect

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Count return 0 for null, but 1 for other data you may not expect.

</ins><span class="cx" style="display: block; padding: 0 10px">                 return array(

</span><span class="cx" style="display: block; padding: 0 10px">                        array( null, 0 ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '', 1 ),

</span></span></pre></div>

<a id="trunktestsphpunittestspostrevisionsphp"></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/revisions.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/revisions.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/post/revisions.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,7 +32,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 16215

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_revision_restore_updates_edit_last_post_meta() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //create a post as Author

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create a post as Author.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_set_current_user( self::$author_user_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $post    = get_default_post_to_edit( 'post', true );

</span><span class="cx" style="display: block; padding: 0 10px">                $post_id = $post->ID;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -45,7 +45,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //update post as Editor

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Update post as Editor.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_set_current_user( self::$editor_user_id );

</span><span class="cx" style="display: block; padding: 0 10px">                wp_update_post(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</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">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //restore back as Admin

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Restore back as Admin.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_set_current_user( self::$admin_user_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $revisions = wp_get_post_revisions( $post->ID );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertCount( 2, $revisions );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,8 +66,8 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                wp_restore_post_revision( $lastrevision->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">-                //is post_meta correctly set to revision author

-               $this->assertEquals( self::$admin_user_id, get_post_meta( $post_id, '_edit_last', true ) ); //after restoring user

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Is post_meta correctly set to revision author after restoring user?

+               $this->assertEquals( self::$admin_user_id, get_post_meta( $post_id, '_edit_last', true ) );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -89,37 +89,37 @@

</span><span class="cx" style="display: 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->assertCount( 1, wp_get_post_revisions( $post_id ) ); // Just the initial revision

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertCount( 1, wp_get_post_revisions( $post_id ) ); // Just the initial revision.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // First update

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // First update.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_update_post(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_content' => 'some updated content',

</span><span class="cx" style="display: block; padding: 0 10px">                                'ID'           => $post_id,

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         ); // First revision.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertCount( 2, wp_get_post_revisions( $post_id ) ); // should be 2 revisions so far

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertCount( 2, wp_get_post_revisions( $post_id ) ); // Should be 2 revisions so far.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //update the post

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Update the post.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_update_post(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_content' => 'new update for some updated content',

</span><span class="cx" style="display: block; padding: 0 10px">                                'ID'           => $post_id,

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                ); //2nd revision

-               $this->assertCount( 3, wp_get_post_revisions( $post_id ) ); // should be 3 revision so far

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         ); // Second revision.

+               $this->assertCount( 3, wp_get_post_revisions( $post_id ) ); // Should be 3 revisions so far.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //next try to save another identical update, tests for patch that prevents storing duplicates

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Next, try to save another identical update, tests for patch that prevents storing duplicates.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_update_post(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_content' => 'new update for some updated content',

</span><span class="cx" style="display: block; padding: 0 10px">                                'ID'           => $post_id,

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                ); //content unchanged, shouldn't save

-               $this->assertCount( 3, wp_get_post_revisions( $post_id ) ); //should still be 3 revision

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         ); // Content unchanged, shouldn't save.

+               $this->assertCount( 3, wp_get_post_revisions( $post_id ) ); // Should still be 3 revisions.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //next try to save another update, same content, but new ttile, should save revision

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Next, try to save another update, same content, but new title, should save revision.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_update_post(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_title'   => 'some-post-changed',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -127,9 +127,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'ID'           => $post_id,

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertCount( 4, wp_get_post_revisions( $post_id ) ); //should  be 4 revision

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertCount( 4, wp_get_post_revisions( $post_id ) ); // Should be 4 revisions.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //next try to save another identical update

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Next, try to save another identical update.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_update_post(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_title'   => 'some-post-changed',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -136,8 +136,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_content' => 'new update for some updated content',

</span><span class="cx" style="display: block; padding: 0 10px">                                'ID'           => $post_id,

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                ); //content unchanged, shouldn't save

-               $this->assertCount( 4, wp_get_post_revisions( $post_id ) ); //should still be 4 revision

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         ); // Content unchanged, shouldn't save.

+               $this->assertCount( 4, wp_get_post_revisions( $post_id ) ); // Should still be 4 revisions.

</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">@@ -164,33 +164,34 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertCount( 1, wp_get_post_revisions( $post_id ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                // First update.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_update_post(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_content' => 'some updated content',

</span><span class="cx" style="display: block; padding: 0 10px">                                'ID'           => $post_id,

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                );    //1st revision

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         ); // First revision.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertCount( 2, wp_get_post_revisions( $post_id ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //update the post

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Update the post.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_update_post(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_content' => 'new update for some updated content',

</span><span class="cx" style="display: block; padding: 0 10px">                                'ID'           => $post_id,

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                ); //2nd revision

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         ); // Second revision.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertCount( 3, wp_get_post_revisions( $post_id ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //next try to save another identical update, tests for patch that prevents storing duplicates

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Next, try to save another identical update, tests for patch that prevents storing duplicates.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_update_post(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_content' => 'new update for some updated content',

</span><span class="cx" style="display: block; padding: 0 10px">                                'ID'           => $post_id,

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                ); //content unchanged, shouldn't save

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         ); // Content unchanged, shouldn't save.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertCount( 4, wp_get_post_revisions( $post_id ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //next try to save another update, same content, but new ttile, should save revision

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Next, try to save another update, same content, but new title, should save revision.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_update_post(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_title'   => 'some-post-changed',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -200,7 +201,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertCount( 5, wp_get_post_revisions( $post_id ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //next try to save another identical update

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Next, try to save another identical update.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_update_post(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_title'   => 'some-post-changed',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -207,7 +208,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_content' => 'new update for some updated content',

</span><span class="cx" style="display: block; padding: 0 10px">                                'ID'           => $post_id,

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                ); //content unchanged, shouldn't save

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         ); // Content unchanged, shouldn't save.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertCount( 6, wp_get_post_revisions( $post_id ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                remove_filter( 'wp_save_post_revision_check_for_changes', '__return_false' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -240,7 +241,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertTrue( user_can( self::$editor_user_id, 'read_post', $revision->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">-                // Author should be able to view the revisions fine

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Author should be able to view the revisions fine.

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $revisions as $revision ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertTrue( user_can( self::$author_user_id, 'read_post', $revision->ID ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -271,7 +272,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertTrue( user_can( self::$editor_user_id, 'edit_post', $revision->post_parent ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Author shouldn't be able to restore the revisions

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Author shouldn't be able to restore the revisions.

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $revisions as $revision ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertFalse( user_can( self::$author_user_id, 'edit_post', $revision->post_parent ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -302,7 +303,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">-                // Diff checks if you can read both left and right revisions

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Diff checks if you can read both left and right revisions.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $revisions = wp_get_post_revisions( $post_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertCount( 2, $revisions );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $revisions as $revision ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -309,7 +310,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertTrue( user_can( self::$editor_user_id, 'read_post', $revision->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">-                // Author should be able to diff the revisions fine

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Author should be able to diff the revisions fine.

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $revisions as $revision ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertTrue( user_can( self::$author_user_id, 'read_post', $revision->ID ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -351,7 +352,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertTrue( user_can( self::$editor_user_id, 'read_post', $revision->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">-                // Author should be able to view the revisions fine

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Author should be able to view the revisions fine.

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $revisions as $revision ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertTrue( user_can( self::$author_user_id, 'read_post', $revision->ID ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -376,7 +377,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $editor_user = new WP_User( self::$editor_user_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $editor_user->add_cap( 'edit_published_events' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //create a post as Editor

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create a post as Editor.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post_id = self::factory()->post->create(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_type'   => $this->post_type,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -396,7 +397,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertTrue( user_can( self::$editor_user_id, 'edit_post', $revision->post_parent ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Author shouldn't be able to restore the revisions

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Author shouldn't be able to restore the revisions.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_set_current_user( self::$author_user_id );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $revisions as $revision ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertFalse( user_can( self::$author_user_id, 'edit_post', $revision->post_parent ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -497,7 +498,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">-                // Diff checks if you can read both left and right revisions

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Diff checks if you can read both left and right revisions.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $revisions = wp_get_post_revisions( $post_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertCount( 2, $revisions );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $revisions as $revision ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -504,7 +505,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertTrue( user_can( self::$editor_user_id, 'read_post', $revision->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">-                // Author should be able to diff the revisions fine

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Author should be able to diff the revisions fine.

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $revisions as $revision ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertTrue( user_can( self::$author_user_id, 'read_post', $revision->ID ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span></span></pre></div>

<a id="trunktestsphpunittestspostslashesphp"></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/slashes.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/slashes.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/post/slashes.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,8 +12,8 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                wp_set_current_user( $this->author_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">-                // it is important to test with both even and odd numbered slashes as

-               // kses does a strip-then-add slashes in some of its function calls

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // It is important to test with both even and odd numbered slashes,

+               // as KSES does a strip-then-add slashes in some of its function calls.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->slash_1 = 'String with 1 slash \\';

</span><span class="cx" style="display: block; padding: 0 10px">                $this->slash_2 = 'String with 2 slashes \\\\';

</span><span class="cx" style="display: block; padding: 0 10px">                $this->slash_3 = 'String with 3 slashes \\\\\\';

</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"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Tests the controller function that expects slashed data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Tests the controller function that expects slashed data.

</ins><span class="cx" style="display: block; padding: 0 10px">          */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_edit_post() {

</span><span class="cx" style="display: block; padding: 0 10px">                $id = self::factory()->post->create();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,8 +34,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['post_title'] = $this->slash_1;

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['content']    = $this->slash_5;

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['excerpt']    = $this->slash_7;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $_POST               = add_magic_quotes( $_POST ); // the edit_post() function will strip slashes

</del><span class="cx" style="display: block; padding: 0 10px"> 

<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                $_POST = add_magic_quotes( $_POST ); // The edit_post() function will strip slashes.

+

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post_id = edit_post();

</span><span class="cx" style="display: block; padding: 0 10px">                $post    = get_post( $post_id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,8 +49,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['post_title'] = $this->slash_2;

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['content']    = $this->slash_4;

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['excerpt']    = $this->slash_6;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $_POST               = add_magic_quotes( $_POST );

</del><span class="cx" style="display: block; padding: 0 10px"> 

<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                $_POST = add_magic_quotes( $_POST ); // The edit_post() function will strip slashes.

+

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post_id = edit_post();

</span><span class="cx" style="display: block; padding: 0 10px">                $post    = get_post( $post_id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -59,7 +61,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Tests the model function that expects slashed data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Tests the model function that expects slashed data.

</ins><span class="cx" style="display: block; padding: 0 10px">          */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wp_insert_post() {

</span><span class="cx" style="display: block; padding: 0 10px">                $id   = wp_insert_post(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -95,7 +97,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">-         * Tests the model function that expects slashed data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Tests the model function that expects slashed data.

</ins><span class="cx" style="display: block; padding: 0 10px">          */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wp_update_post() {

</span><span class="cx" style="display: block; padding: 0 10px">                $id = self::factory()->post->create();

</span></span></pre></div>

<a id="trunktestsphpunittestsposttemplatephp"></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/template.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/template.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/post/template.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -424,7 +424,7 @@

<span class="cx" style="display: block; padding: 0 10px">                // After falling back, the 'after' argument should be set and output as '</ul>'.

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertRegExp( '/<\/ul><\/div>/', $menu );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // After falling back, the markup should include whitespace around <li>s

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // After falling back, the markup should include whitespace around <li>'s.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertRegExp( '/\s<li.*>|<\/li>\s/U', $menu );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotRegExp( '/><li.*>|<\/li></U', $menu );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -447,7 +447,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">-                // After falling back, the markup should not include whitespace around <li>s

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // After falling back, the markup should not include whitespace around <li>'s.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertNotRegExp( '/\s<li.*>|<\/li>\s/U', $menu );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertRegExp( '/><li.*>|<\/li></U', $menu );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunktestsphpunittestsposttypesphp"></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/types.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/types.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/post/types.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,7 +32,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'WP_Post_Type', $pobj );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'foo', $pobj->name );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test some defaults

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test some defaults.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( is_post_type_hierarchical( 'foo' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array(), get_object_taxonomies( 'foo' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -45,7 +45,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @expectedIncorrectUsage register_post_type

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_register_post_type_with_too_long_name() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // post type too long

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Post type too long.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertInstanceOf( 'WP_Error', register_post_type( 'abcdefghijklmnopqrstuvwxyz0123456789' ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -55,7 +55,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @expectedIncorrectUsage register_post_type

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_register_post_type_with_empty_name() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // post type too short

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Post type too short.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertInstanceOf( 'WP_Error', register_post_type( '' ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -333,7 +333,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( unregister_post_type( 'foo' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotContains( '%foo%', $wp_rewrite->rewritecode );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotContains( 'bar=', $wp_rewrite->queryreplace );

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertSame( -- $count_before, count( $wp_rewrite->rewritereplace ) ); // Array was reduced by one value.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( --$count_before, count( $wp_rewrite->rewritereplace ) ); // Array was reduced by one 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="trunktestsphpunittestspostwpUniquePostSlugphp"></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/wpUniquePostSlug.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/wpUniquePostSlug.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/post/wpUniquePostSlug.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -121,7 +121,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'image', get_post( $attachment )->post_name );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'image-2', get_post( $two )->post_name );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // 'image' can be a child of image-2

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // 'image' can be a child of image-2.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 'image', wp_unique_post_slug( 'image', 0, 'publish', 'post-type-1', $two ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                _unregister_post_type( 'post-type-1' );

</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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/post.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,12 +39,16 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->post_ids = array();

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // helper function: return the timestamp(s) of cron jobs for the specified hook and post

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**

+        * Helper function: return the timestamp(s) of cron jobs for the specified hook and post.

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         function _next_schedule_for_post( $hook, $id ) {

</span><span class="cx" style="display: block; padding: 0 10px">                return wp_next_scheduled( 'publish_future_post', array( 0 => intval( $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">-        // helper function, unsets current user globally

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**

+        * Helper function, unsets current user globally.

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         function _unset_current_user() {

</span><span class="cx" style="display: block; padding: 0 10px">                global $current_user, $user_ID;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,7 +56,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $user_ID      = null;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // test simple valid behavior: insert and get a post

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**

+        * Test simple valid behavior: insert and get a post.

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_vb_insert_get_delete() {

</span><span class="cx" style="display: block; padding: 0 10px">                register_post_type( 'cpt', array( 'taxonomies' => array( 'post_tag', 'ctax' ) ) );

</span><span class="cx" style="display: block; padding: 0 10px">                register_taxonomy( 'ctax', 'cpt' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,12 +77,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_type'    => $post_type,

</span><span class="cx" style="display: block; padding: 0 10px">                        );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // insert a post and make sure the ID is ok

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Insert a post and make sure the ID is OK.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $id = wp_insert_post( $post );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertTrue( is_numeric( $id ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertTrue( $id > 0 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // fetch the post and make sure it matches

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Fetch the post and make sure it matches.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $out = get_post( $id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $post['post_content'], $out->post_content );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,7 +90,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $post['post_status'], $out->post_status );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $post['post_author'], $out->post_author );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // test cache state

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Test cache state.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $pcache = wp_cache_get( $id, 'posts' );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertInstanceOf( 'stdClass', $pcache );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $id, $pcache->ID );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -111,9 +117,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $GLOBALS['wp_taxonomies']['post_tag']->object_type = array( 'post' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        /**

+        * Insert a post with a future date, and make sure the status and cron schedule are correct.

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_vb_insert_future() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // insert a post with a future date, and make sure the status and cron schedule are correct

-

</del><span class="cx" style="display: block; padding: 0 10px">                 $future_date = strtotime( '+1 day' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $post = array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,14 +131,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'post_date'    => strftime( '%Y-%m-%d %H:%M:%S', $future_date ),

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // insert a post and make sure the ID is ok

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Insert a post and make sure the ID is OK.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $id               = wp_insert_post( $post );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->post_ids[] = $id;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                #dmp(_get_cron_array());

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // dmp( _get_cron_array() );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( is_numeric( $id ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $id > 0 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // fetch the post and make sure it matches

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Fetch the post and make sure it matches.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = get_post( $id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $post['post_content'], $out->post_content );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -140,14 +147,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $post['post_author'], $out->post_author );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $post['post_date'], $out->post_date );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // there should be a publish_future_post hook scheduled on the future date

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // There should be a publish_future_post hook scheduled on the future date.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $future_date, $this->_next_schedule_for_post( 'publish_future_post', $id ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        /**

+        * Insert a post with a future date, and make sure the status and cron schedule are correct.

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_vb_insert_future_over_dst() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // insert a post with a future date, and make sure the status and cron schedule are correct

-

-               // Some magic days - one dst one not

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Some magic days - one DST one not.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $future_date_1 = strtotime( 'June 21st +1 year' );

</span><span class="cx" style="display: block; padding: 0 10px">                $future_date_2 = strtotime( 'Jan 11th +1 year' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -159,19 +167,19 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'post_date'    => strftime( '%Y-%m-%d %H:%M:%S', $future_date_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">-                // insert a post and make sure the ID is ok

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Insert a post and make sure the ID is OK.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $id               = wp_insert_post( $post );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->post_ids[] = $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">-                // fetch the post and make sure has the correct date and status

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Fetch the post and make sure has the correct date and status.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = get_post( $id );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'future', $out->post_status );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $post['post_date'], $out->post_date );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // check that there's a publish_future_post job scheduled at the right time

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check that there's a publish_future_post job scheduled at the right time.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $future_date_1, $this->_next_schedule_for_post( 'publish_future_post', $id ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // now save it again with a date further in the future

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Now save it again with a date further in the future.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $post['ID']            = $id;

</span><span class="cx" style="display: block; padding: 0 10px">                $post['post_date']     = strftime( '%Y-%m-%d %H:%M:%S', $future_date_2 );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -178,19 +186,21 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $post['post_date_gmt'] = null;

</span><span class="cx" style="display: block; padding: 0 10px">                wp_update_post( $post );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // fetch the post again and make sure it has the new post_date

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Fetch the post again and make sure it has the new post_date.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = get_post( $id );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'future', $out->post_status );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $post['post_date'], $out->post_date );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // and the correct date on the cron job

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // And the correct date on the cron job.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $future_date_2, $this->_next_schedule_for_post( 'publish_future_post', $id ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        /**

+        * Future post bug: posts get published at the wrong time if you edit the timestamp.

+        *

+        * @ticket 4710

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_vb_insert_future_edit_bug() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // future post bug: posts get published at the wrong time if you edit the timestamp

-               // https://core.trac.wordpress.org/ticket/4710

-

</del><span class="cx" style="display: block; padding: 0 10px">                 $future_date_1 = strtotime( '+1 day' );

</span><span class="cx" style="display: block; padding: 0 10px">                $future_date_2 = strtotime( '+2 day' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -202,19 +212,19 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'post_date'    => strftime( '%Y-%m-%d %H:%M:%S', $future_date_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">-                // insert a post and make sure the ID is ok

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Insert a post and make sure the ID is OK.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $id               = wp_insert_post( $post );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->post_ids[] = $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">-                // fetch the post and make sure has the correct date and status

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Fetch the post and make sure has the correct date and status.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = get_post( $id );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'future', $out->post_status );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $post['post_date'], $out->post_date );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // check that there's a publish_future_post job scheduled at the right time

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check that there's a publish_future_post job scheduled at the right time.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $future_date_1, $this->_next_schedule_for_post( 'publish_future_post', $id ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // now save it again with a date further in the future

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Now save it again with a date further in the future.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $post['ID']            = $id;

</span><span class="cx" style="display: block; padding: 0 10px">                $post['post_date']     = strftime( '%Y-%m-%d %H:%M:%S', $future_date_2 );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -221,18 +231,19 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $post['post_date_gmt'] = null;

</span><span class="cx" style="display: block; padding: 0 10px">                wp_update_post( $post );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // fetch the post again and make sure it has the new post_date

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Fetch the post again and make sure it has the new post_date.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = get_post( $id );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'future', $out->post_status );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $post['post_date'], $out->post_date );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // and the correct date on the cron job

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // And the correct date on the cron job.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $future_date_2, $this->_next_schedule_for_post( 'publish_future_post', $id ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        /**

+        * Insert a draft post with a future date, and make sure no cron schedule is set.

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_vb_insert_future_draft() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // insert a draft post with a future date, and make sure no cron schedule is set

-

</del><span class="cx" style="display: block; padding: 0 10px">                 $future_date = strtotime( '+1 day' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $post = array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -243,14 +254,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'post_date'    => strftime( '%Y-%m-%d %H:%M:%S', $future_date ),

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // insert a post and make sure the ID is ok

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Insert a post and make sure the ID is OK.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $id               = wp_insert_post( $post );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->post_ids[] = $id;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                #dmp(_get_cron_array());

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // dmp( _get_cron_array() );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( is_numeric( $id ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $id > 0 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // fetch the post and make sure it matches

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Fetch the post and make sure it matches.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = get_post( $id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $post['post_content'], $out->post_content );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -259,13 +270,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $post['post_author'], $out->post_author );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $post['post_date'], $out->post_date );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // there should be a publish_future_post hook scheduled on the future date

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // There should be a publish_future_post hook scheduled on the future date.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( false, $this->_next_schedule_for_post( 'publish_future_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="cx" style="display: block; padding: 0 10px"> 

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        /**

+        * Insert a future post, then edit and change it to draft, and make sure cron gets it right.

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_vb_insert_future_change_to_draft() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // insert a future post, then edit and change it to draft, and make sure cron gets it right

</del><span class="cx" style="display: block; padding: 0 10px">                 $future_date_1 = strtotime( '+1 day' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $post = array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -276,35 +289,37 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'post_date'    => strftime( '%Y-%m-%d %H:%M:%S', $future_date_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">-                // insert a post and make sure the ID is ok

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Insert a post and make sure the ID is OK.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $id               = wp_insert_post( $post );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->post_ids[] = $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">-                // fetch the post and make sure has the correct date and status

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Fetch the post and make sure has the correct date and status.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = get_post( $id );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'future', $out->post_status );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $post['post_date'], $out->post_date );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // check that there's a publish_future_post job scheduled at the right time

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check that there's a publish_future_post job scheduled at the right time.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $future_date_1, $this->_next_schedule_for_post( 'publish_future_post', $id ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // now save it again with status set to draft

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Now save it again with status set to draft.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $post['ID']          = $id;

</span><span class="cx" style="display: block; padding: 0 10px">                $post['post_status'] = 'draft';

</span><span class="cx" style="display: block; padding: 0 10px">                wp_update_post( $post );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // fetch the post again and make sure it has the new post_date

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Fetch the post again and make sure it has the new post_date.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = get_post( $id );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'draft', $out->post_status );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $post['post_date'], $out->post_date );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // and the correct date on the cron job

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // And the correct date on the cron job.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( false, $this->_next_schedule_for_post( 'publish_future_post', $id ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        /**

+        * Insert a future post, then edit and change the status, and make sure cron gets it right.

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_vb_insert_future_change_status() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // insert a future post, then edit and change the status, and make sure cron gets it right

</del><span class="cx" style="display: block; padding: 0 10px">                 $future_date_1 = strtotime( '+1 day' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $statuses = array( 'draft', 'static', 'object', 'attachment', 'inherit', 'pending' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -318,37 +333,38 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_date'    => strftime( '%Y-%m-%d %H:%M:%S', $future_date_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">-                        // insert a post and make sure the ID is ok

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Insert a post and make sure the ID is OK.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $id               = wp_insert_post( $post );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->post_ids[] = $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">-                        // fetch the post and make sure has the correct date and status

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Fetch the post and make sure has the correct date and status.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $out = get_post( $id );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( 'future', $out->post_status );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $post['post_date'], $out->post_date );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // check that there's a publish_future_post job scheduled at the right time

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Check that there's a publish_future_post job scheduled at the right time.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertEquals( $future_date_1, $this->_next_schedule_for_post( 'publish_future_post', $id ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // now save it again with status changed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Now save it again with status changed.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $post['ID']          = $id;

</span><span class="cx" style="display: block; padding: 0 10px">                        $post['post_status'] = $status;

</span><span class="cx" style="display: block; padding: 0 10px">                        wp_update_post( $post );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // fetch the post again and make sure it has the new post_date

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Fetch the post again and make sure it has the new post_date.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $out = get_post( $id );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $status, $out->post_status );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $post['post_date'], $out->post_date );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // and the correct date on the cron job

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // And the correct date on the cron job.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertEquals( false, $this->_next_schedule_for_post( 'publish_future_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="cx" style="display: block; padding: 0 10px"> 

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        /**

+        * Insert a draft post with a future date, and make sure no cron schedule is set.

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_vb_insert_future_private() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // insert a draft post with a future date, and make sure no cron schedule is set

-

</del><span class="cx" style="display: block; padding: 0 10px">                 $future_date = strtotime( '+1 day' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $post = array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -359,14 +375,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'post_date'    => strftime( '%Y-%m-%d %H:%M:%S', $future_date ),

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // insert a post and make sure the ID is ok

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Insert a post and make sure the ID is OK.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $id               = wp_insert_post( $post );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->post_ids[] = $id;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                #dmp(_get_cron_array());

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // dmp( _get_cron_array() );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( is_numeric( $id ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $id > 0 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // fetch the post and make sure it matches

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Fetch the post and make sure it matches.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = get_post( $id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $post['post_content'], $out->post_content );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -375,16 +391,16 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $post['post_author'], $out->post_author );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $post['post_date'], $out->post_date );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // there should be a publish_future_post hook scheduled on the future date

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // There should be a publish_future_post hook scheduled on the future date.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( false, $this->_next_schedule_for_post( 'publish_future_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="cx" style="display: block; padding: 0 10px">        /**

<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * Insert a post with an invalid date, make sure it fails.

+        *

</ins><span class="cx" style="display: block; padding: 0 10px">          * @ticket 17180

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_vb_insert_invalid_date() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // insert a post with an invalid date, make sure it fails

-

</del><span class="cx" style="display: block; padding: 0 10px">                 $post = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'post_author'  => self::$editor_id,

</span><span class="cx" style="display: block; padding: 0 10px">                        'post_status'  => 'public',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -393,7 +409,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'post_date'    => '2012-02-30 00:00:00',

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test both return paths with or without WP_Error

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test both return paths with or without WP_Error.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $insert_post = wp_insert_post( $post, true );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertWPError( $insert_post );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'invalid_date', $insert_post->get_error_code() );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -402,8 +418,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 0, $insert_post );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        /**

+        * Insert a future post, then edit and change it to private, and make sure cron gets it right.

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_vb_insert_future_change_to_private() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // insert a future post, then edit and change it to private, and make sure cron gets it right

</del><span class="cx" style="display: block; padding: 0 10px">                 $future_date_1 = strtotime( '+1 day' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $post = array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -414,30 +432,30 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'post_date'    => strftime( '%Y-%m-%d %H:%M:%S', $future_date_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">-                // insert a post and make sure the ID is ok

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Insert a post and make sure the ID is OK.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $id               = wp_insert_post( $post );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->post_ids[] = $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">-                // fetch the post and make sure has the correct date and status

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Fetch the post and make sure has the correct date and status.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = get_post( $id );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'future', $out->post_status );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $post['post_date'], $out->post_date );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // check that there's a publish_future_post job scheduled at the right time

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check that there's a publish_future_post job scheduled at the right time.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $future_date_1, $this->_next_schedule_for_post( 'publish_future_post', $id ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // now save it again with status set to draft

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Now save it again with status set to draft.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $post['ID']          = $id;

</span><span class="cx" style="display: block; padding: 0 10px">                $post['post_status'] = 'private';

</span><span class="cx" style="display: block; padding: 0 10px">                wp_update_post( $post );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // fetch the post again and make sure it has the new post_date

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Fetch the post again and make sure it has the new post_date.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = get_post( $id );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'private', $out->post_status );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $post['post_date'], $out->post_date );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // and the correct date on the cron job

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // And the correct date on the cron job.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( false, $this->_next_schedule_for_post( 'publish_future_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">@@ -505,10 +523,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * "When I delete a future post using wp_delete_post( $post->ID ) it does not update the cron correctly."

+        *

</ins><span class="cx" style="display: block; padding: 0 10px">          * @ticket 5364

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_delete_future_post_cron() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // "When I delete a future post using wp_delete_post($post->ID) it does not update the cron correctly."

</del><span class="cx" style="display: block; padding: 0 10px">                 $future_date = strtotime( '+1 day' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $post = array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -519,14 +538,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'post_date'    => strftime( '%Y-%m-%d %H:%M:%S', $future_date ),

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // insert a post and make sure the ID is ok

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Insert a post and make sure the ID is OK.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $id               = wp_insert_post( $post );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->post_ids[] = $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">-                // check that there's a publish_future_post job scheduled at the right time

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check that there's a publish_future_post job scheduled at the right time.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $future_date, $this->_next_schedule_for_post( 'publish_future_post', $id ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // now delete the post and make sure the cron entry is removed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Now delete the post and make sure the cron entry is removed.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_delete_post( $id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $this->_next_schedule_for_post( 'publish_future_post', $id ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -533,12 +552,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">        /**

<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * Bug: permalink doesn't work if post title is empty.

+        *

+        * Might only fail if the post ID is greater than four characters.

+        *

</ins><span class="cx" style="display: block; padding: 0 10px">          * @ticket 5305

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_permalink_without_title() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // bug: permalink doesn't work if post title is empty

-               // might only fail if the post ID is greater than four characters

-

</del><span class="cx" style="display: block; padding: 0 10px">                 $this->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $post = array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -549,13 +569,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'post_date'    => '2007-10-31 06:15:00',

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // insert a post and make sure the ID is ok

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Insert a post and make sure the ID is OK.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $id               = wp_insert_post( $post );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->post_ids[] = $id;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $plink = get_permalink( $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">-                // permalink should include the post ID at the end

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Permalink should include the post ID at the end.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( get_option( 'siteurl' ) . '/2007/10/31/' . $id . '/', $plink );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1106,7 +1126,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_user_without_publish_cannot_affect_sticky() {

</span><span class="cx" style="display: block; padding: 0 10px">                wp_set_current_user( self::$grammarian_id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Sanity Check.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Sanity check.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( current_user_can( 'publish_posts' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( current_user_can( 'edit_others_posts' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( current_user_can( 'edit_published_posts' ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1120,7 +1140,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                stick_post( $post->ID );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Sanity Check.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Sanity check.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( is_sticky( $post->ID ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Edit the post.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1151,17 +1171,17 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                stick_post( $post->ID );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Sanity Check.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Sanity check.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( is_sticky( $post->ID ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                wp_set_current_user( self::$grammarian_id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Sanity Check.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Sanity check.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( current_user_can( 'publish_posts' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( current_user_can( 'edit_others_posts' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( current_user_can( 'edit_published_posts' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Edit the post - The key 'sticky' is intentionally unset.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Edit the post - the key 'sticky' is intentionally unset.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $data = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'post_ID'      => $post->ID,

</span><span class="cx" style="display: block; padding: 0 10px">                        'post_title'   => 'Updated',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1169,7 +1189,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                edit_post( $data );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make sure it's still sticky

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure it's still sticky.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $saved_post = get_post( $post->ID );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( is_sticky( $saved_post->ID ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'Updated', $saved_post->post_title );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1259,7 +1279,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'post_date_gmt' => '2014-01-01 12:00:00',

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // insert a post and make sure the ID is ok

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Insert a post and make sure the ID is OK.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $id = wp_insert_post( $post );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $out = get_post( $id );

</span></span></pre></div>

<a id="trunktestsphpunittestsquerycommentCountphp"></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/query/commentCount.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/query/commentCount.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/query/commentCount.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,7 +5,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Query_CommentCount extends WP_UnitTestCase {

</span><span class="cx" style="display: block; padding: 0 10px">        static $post_ids = array();

</span><span class="cx" style="display: block; padding: 0 10px">        public $q;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        static $post_type = 'page'; // can be anything

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ static $post_type = 'page'; // Can be anything.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        public function setUp() {

</span><span class="cx" style="display: block; padding: 0 10px">                parent::setUp();

</span></span></pre></div>

<a id="trunktestsphpunittestsqueryconditionalsphp"></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/query/conditionals.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/query/conditionals.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/query/conditionals.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -187,16 +187,16 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $url = get_permalink( $page_id );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->go_to( "{$url}trackback/" );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // make sure the correct wp_query flags are set

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Make sure the correct WP_Query flags are set.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertQueryTrue( 'is_page', 'is_singular', 'is_trackback' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // make sure the correct page was fetched

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Make sure the correct page was fetched.

</ins><span class="cx" style="display: block; padding: 0 10px">                         global $wp_query;

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $page_id, $wp_query->get_queried_object()->ID );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        //'(about)/feed/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?pagename=$matches[1]&feed=$matches[2]'

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // '(about)/feed/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?pagename=$matches[1]&feed=$matches[2]'

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_page_feed() {

</span><span class="cx" style="display: block; padding: 0 10px">                $page_ids   = array();

</span><span class="cx" style="display: block; padding: 0 10px">                $page_id    = self::factory()->post->create(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -226,10 +226,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $url = get_permalink( $page_id );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->go_to( "{$url}feed/" );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // make sure the correct wp_query flags are set

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Make sure the correct WP_Query flags are set.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertQueryTrue( 'is_page', 'is_singular', 'is_feed', 'is_comment_feed' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // make sure the correct page was fetched

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Make sure the correct page was fetched.

</ins><span class="cx" style="display: block; padding: 0 10px">                         global $wp_query;

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $page_id, $wp_query->get_queried_object()->ID );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -263,10 +263,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $url = get_permalink( $page_id );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->go_to( "{$url}feed/" );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // make sure the correct wp_query flags are set

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Make sure the correct WP_Query flags are set.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertQueryTrue( 'is_page', 'is_singular', 'is_feed', 'is_comment_feed' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // make sure the correct page was fetched

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Make sure the correct page was fetched.

</ins><span class="cx" style="display: block; padding: 0 10px">                         global $wp_query;

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $page_id, $wp_query->get_queried_object()->ID );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -303,10 +303,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $url = get_permalink( $page_id );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->go_to( "{$url}feed/atom/" );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // make sure the correct wp_query flags are set

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Make sure the correct WP_Query flags are set.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertQueryTrue( 'is_page', 'is_singular', 'is_feed', 'is_comment_feed' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // make sure the correct page was fetched

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Make sure the correct page was fetched.

</ins><span class="cx" style="display: block; padding: 0 10px">                         global $wp_query;

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $page_id, $wp_query->get_queried_object()->ID );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -323,10 +323,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->go_to( '/about/page/2/' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // make sure the correct wp_query flags are set

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure the correct WP_Query flags are set.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertQueryTrue( 'is_page', 'is_singular', 'is_paged' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // make sure the correct page was fetched

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure the correct page was fetched.

</ins><span class="cx" style="display: block; padding: 0 10px">                 global $wp_query;

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $page_id, $wp_query->get_queried_object()->ID );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -342,10 +342,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->go_to( '/about/page2/' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // make sure the correct wp_query flags are set

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure the correct WP_Query flags are set.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertQueryTrue( 'is_page', 'is_singular', 'is_paged' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // make sure the correct page was fetched

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure the correct page was fetched.

</ins><span class="cx" style="display: block; padding: 0 10px">                 global $wp_query;

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $page_id, $wp_query->get_queried_object()->ID );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -366,7 +366,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertQueryTrue( 'is_home', 'is_posts_page' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // make sure the correct page was fetched

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure the correct page was fetched.

</ins><span class="cx" style="display: block; padding: 0 10px">                 global $wp_query;

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $page_id, $wp_query->get_queried_object()->ID );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -374,7 +374,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                delete_option( 'page_for_posts' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // FIXME: no tests for these yet

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // FIXME: no tests for these yet:

</ins><span class="cx" style="display: block; padding: 0 10px">         // 'about/attachment/([^/]+)/?$' => 'index.php?attachment=$matches[1]',

</span><span class="cx" style="display: block; padding: 0 10px">        // 'about/attachment/([^/]+)/trackback/?$' => 'index.php?attachment=$matches[1]&tb=1',

</span><span class="cx" style="display: block; padding: 0 10px">        // 'about/attachment/([^/]+)/feed/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?attachment=$matches[1]&feed=$matches[2]',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -386,13 +386,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                self::factory()->post->create(); // @test_404

</span><span class="cx" style="display: block; padding: 0 10px">                $feeds = array( 'feed', 'rdf', 'rss', 'rss2', 'atom' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // long version

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Long version.

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $feeds as $feed ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->go_to( "/feed/{$feed}/" );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertQueryTrue( 'is_feed' );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // short version

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Short version.

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $feeds as $feed ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->go_to( "/{$feed}/" );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertQueryTrue( 'is_feed' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -425,11 +425,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $post_id = self::factory()->post->create( array( 'post_title' => 'hello-world' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                self::factory()->comment->create_post_comments( $post_id, 2 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // check the url as generated by get_post_comments_feed_link()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check the URL as generated by get_post_comments_feed_link().

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->go_to( get_post_comments_feed_link( $post_id ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertQueryTrue( 'is_feed', 'is_single', 'is_singular', 'is_comment_feed' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // check the long form

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check the long form.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $types = array( 'feed', 'rdf', 'rss', 'rss2', 'atom' );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $types as $type ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->go_to( "/comments/feed/{$type}" );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -436,7 +436,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->assertQueryTrue( 'is_feed', 'is_comment_feed' );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // check the short form

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check the short form.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $types = array( 'feed', 'rdf', 'rss', 'rss2', 'atom' );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $types as $type ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->go_to( "/comments/{$type}" );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -448,7 +448,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        // 'search/(.+)/feed/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?s=$matches[1]&feed=$matches[2]',

</span><span class="cx" style="display: block; padding: 0 10px">        // 'search/(.+)/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?s=$matches[1]&feed=$matches[2]',

</span><span class="cx" style="display: block; padding: 0 10px">        function test_search_feed() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // check the long form

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check the long form.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $types = array( 'feed', 'rdf', 'rss', 'rss2', 'atom' );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $types as $type ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->go_to( "/search/test/feed/{$type}" );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -455,7 +455,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->assertQueryTrue( 'is_feed', 'is_search' );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // check the short form

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Сheck the short form.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $types = array( 'feed', 'rdf', 'rss', 'rss2', 'atom' );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $types as $type ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->go_to( "/search/test/{$type}" );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -495,7 +495,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // check the long form

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check the long form.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $types = array( 'feed', 'rdf', 'rss', 'rss2', 'atom' );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $types as $type ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->go_to( "/category/cat-a/feed/{$type}" );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -502,7 +502,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertQueryTrue( 'is_archive', 'is_feed', 'is_category' );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // check the short form

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check the short form.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $types = array( 'feed', 'rdf', 'rss', 'rss2', 'atom' );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $types as $type ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->go_to( "/category/cat-a/{$type}" );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -539,7 +539,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'taxonomy' => 'post_tag',

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // check the long form

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check the long form.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $types = array( 'feed', 'rdf', 'rss', 'rss2', 'atom' );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $types as $type ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->go_to( "/tag/tag-a/feed/{$type}" );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -546,7 +546,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->assertQueryTrue( 'is_archive', 'is_feed', 'is_tag' );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // check the short form

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check the short form.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $types = array( 'feed', 'rdf', 'rss', 'rss2', 'atom' );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $types as $type ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->go_to( "/tag/tag-a/{$type}" );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -593,7 +593,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        // 'author/([^/]+)/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?author_name=$matches[1]&feed=$matches[2]',

</span><span class="cx" style="display: block; padding: 0 10px">        function test_author_feed() {

</span><span class="cx" style="display: block; padding: 0 10px">                self::factory()->user->create( array( 'user_login' => 'user-a' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // check the long form

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check the long form.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $types = array( 'feed', 'rdf', 'rss', 'rss2', 'atom' );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $types as $type ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->go_to( "/author/user-a/feed/{$type}" );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -600,7 +600,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->assertQueryTrue( 'is_archive', 'is_feed', 'is_author' );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // check the short form

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check the short form.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $types = array( 'feed', 'rdf', 'rss', 'rss2', 'atom' );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $types as $type ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->go_to( "/author/user-a/{$type}" );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -635,7 +635,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        // '([0-9]{4})/([0-9]{1,2})/([0-9]{1,2})/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?year=$matches[1]&monthnum=$matches[2]&day=$matches[3]&feed=$matches[4]',

</span><span class="cx" style="display: block; padding: 0 10px">        function test_ymd_feed() {

</span><span class="cx" style="display: block; padding: 0 10px">                self::factory()->post->create( array( 'post_date' => '2007-09-04 00:00:00' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // check the long form

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check the long form.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $types = array( 'feed', 'rdf', 'rss', 'rss2', 'atom' );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $types as $type ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->go_to( "/2007/09/04/feed/{$type}" );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -642,7 +642,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->assertQueryTrue( 'is_archive', 'is_feed', 'is_day', 'is_date' );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // check the short form

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check the short form.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $types = array( 'feed', 'rdf', 'rss', 'rss2', 'atom' );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $types as $type ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->go_to( "/2007/09/04/{$type}" );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -669,7 +669,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        // '([0-9]{4})/([0-9]{1,2})/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?year=$matches[1]&monthnum=$matches[2]&feed=$matches[3]',

</span><span class="cx" style="display: block; padding: 0 10px">        function test_ym_feed() {

</span><span class="cx" style="display: block; padding: 0 10px">                self::factory()->post->create( array( 'post_date' => '2007-09-04 00:00:00' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // check the long form

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check the long form.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $types = array( 'feed', 'rdf', 'rss', 'rss2', 'atom' );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $types as $type ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->go_to( "/2007/09/feed/{$type}" );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -676,7 +676,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->assertQueryTrue( 'is_archive', 'is_feed', 'is_month', 'is_date' );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // check the short form

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check the short form.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $types = array( 'feed', 'rdf', 'rss', 'rss2', 'atom' );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $types as $type ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->go_to( "/2007/09/{$type}" );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -703,7 +703,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        // '([0-9]{4})/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?year=$matches[1]&feed=$matches[2]',

</span><span class="cx" style="display: block; padding: 0 10px">        function test_y_feed() {

</span><span class="cx" style="display: block; padding: 0 10px">                self::factory()->post->create( array( 'post_date' => '2007-09-04 00:00:00' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // check the long form

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check the long form.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $types = array( 'feed', 'rdf', 'rss', 'rss2', 'atom' );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $types as $type ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->go_to( "/2007/feed/{$type}" );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -710,7 +710,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->assertQueryTrue( 'is_archive', 'is_feed', 'is_year', 'is_date' );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // check the short form

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check the short form.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $types = array( 'feed', 'rdf', 'rss', 'rss2', 'atom' );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $types as $type ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->go_to( "/2007/{$type}" );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -746,7 +746,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_post_comment_feed() {

</span><span class="cx" style="display: block; padding: 0 10px">                $post_id   = self::factory()->post->create();

</span><span class="cx" style="display: block; padding: 0 10px">                $permalink = get_permalink( $post_id );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check the long form.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $types = array( 'feed', 'rdf', 'rss', 'rss2', 'atom' );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $types as $type ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->go_to( "{$permalink}feed/{$type}" );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -753,7 +753,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->assertQueryTrue( 'is_single', 'is_singular', 'is_feed', 'is_comment_feed' );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // check the short form

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check the short form.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $types = array( 'feed', 'rdf', 'rss', 'rss2', 'atom' );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $types as $type ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->go_to( "{$permalink}{$type}" );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -771,7 +771,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->go_to( get_permalink( $post_id ) . '2/' );

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // should is_paged be true also?

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Should is_paged be true also?

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertQueryTrue( 'is_single', 'is_singular' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</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">         * @ticket 16802

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_is_single_with_parent() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Use custom hierarchical post type

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Use custom hierarchical post type.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post_type = 'test_hierarchical';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                register_post_type(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -914,7 +914,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">-                // Create parent and child posts

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create parent and child posts.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $parent_id = self::factory()->post->create(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_type' => $post_type,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -930,7 +930,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">-                // Tests

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Tests.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->go_to( "/?p=$post_id&post_type=$post_type" );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $post = get_queried_object();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1199,7 +1199,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $post_id = self::factory()->post->create( array( 'post_type' => 'page' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->go_to( "/?page_id=$post_id" );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // override post ID to 0 temporarily for testing

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Override post ID to 0 temporarily for testing.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_id                           = $GLOBALS['wp_query']->post->ID;

</span><span class="cx" style="display: block; padding: 0 10px">                $GLOBALS['wp_query']->post->ID = 0;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1210,7 +1210,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $q->is_page( 'sample-page' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $q->is_page( 'random-page-slug' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // revert $wp_query global change

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Revert $wp_query global change.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $GLOBALS['wp_query']->post->ID = $_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="trunktestsphpunittestsquerydatephp"></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/query/date.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/query/date.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/query/date.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -55,9 +55,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $args = wp_parse_args(

</span><span class="cx" style="display: block; padding: 0 10px">                        $args,

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                'post_status'    => 'any', // For the future post

-                               'posts_per_page' => '-1',  // To make sure results are accurate

-                               'orderby'        => 'ID',  // Same order they were created

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         'post_status'    => 'any', // For the future post.

+                               'posts_per_page' => '-1',  // To make sure results are accurate.

+                               'orderby'        => 'ID',  // Same order they were created.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'order'          => 'ASC',

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -294,7 +294,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = $this->_get_query_result();

</span><span class="cx" style="display: block; padding: 0 10px">                $posts    = $this->_get_query_result(

</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">-                                'm' => array( '1234' ), // ignored

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         'm' => array( '1234' ), // Ignored.

</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="trunktestsphpunittestsquerydateQueryphp"></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/query/dateQuery.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/query/dateQuery.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/query/dateQuery.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,9 +23,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $args = wp_parse_args(

</span><span class="cx" style="display: block; padding: 0 10px">                        $args,

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                'post_status'            => 'any', // For the future post

-                               'posts_per_page'         => '-1',  // To make sure results are accurate

-                               'orderby'                => 'ID',  // Same order they were created

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         'post_status'            => 'any', // For the future post.

+                               'posts_per_page'         => '-1',  // To make sure results are accurate.

+                               'orderby'                => 'ID',  // Same order they were created.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'order'                  => 'ASC',

</span><span class="cx" style="display: block; padding: 0 10px">                                'update_post_meta_cache' => false,

</span><span class="cx" style="display: block; padding: 0 10px">                                'update_post_term_cache' => false,

</span></span></pre></div>

<a id="trunktestsphpunittestsqueryisTermphp"></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/query/isTerm.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/query/isTerm.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/query/isTerm.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,7 +77,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">        function test_tag_action_tax() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // tag with tax added

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Tag with taxonomy added.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->go_to( home_url( '/tag/tag-slug/' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertQueryTrue( 'is_tag', 'is_archive' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEmpty( get_query_var( 'tax_query' ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -88,7 +88,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_tag_query_cat_action_tax() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // tag + category with tax added

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Tag + category with taxonomy added.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->go_to( home_url( "/tag/tag-slug/?cat=$this->cat_id" ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertQueryTrue( 'is_category', 'is_tag', 'is_archive' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEmpty( get_query_var( 'tax_query' ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,7 +100,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">        function test_tag_query_cat_query_tax_action_tax() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // tag + category + tax with tax added

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Tag + category + tax with taxonomy added.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->go_to( home_url( "/tag/tag-slug/?cat=$this->cat_id&testtax=tax-slug2" ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertQueryTrue( 'is_category', 'is_tag', 'is_tax', 'is_archive' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEmpty( get_query_var( 'tax_query' ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -113,7 +113,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_cat_action_tax() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // category with tax added

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Category with taxonomy added.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->go_to( home_url( '/category/cat-slug/' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertQueryTrue( 'is_category', 'is_archive' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEmpty( get_query_var( 'cat' ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -127,7 +127,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 26627

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_cat_uncat_action_tax() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // category with tax added

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Category with taxonomy added.

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_action( 'pre_get_posts', array( $this, '_cat_uncat_action_tax' ), 11 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->go_to( home_url( '/category/uncategorized/' ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -153,7 +153,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 26728

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_tax_action_tax() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // tax with tax added

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Taxonomy with taxonomy added.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->go_to( home_url( '/testtax/tax-slug2/' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertQueryTrue( 'is_tax', 'is_archive' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEmpty( get_query_var( 'tax_query' ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -163,7 +163,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_tax_query_tag_action_tax() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // tax + tag with tax added

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Taxonomy + tag with taxonomy added.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->go_to( home_url( "/testtax/tax-slug2/?tag_id=$this->tag_id" ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertQueryTrue( 'is_tag', 'is_tax', 'is_archive' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEmpty( get_query_var( 'tax_query' ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -174,7 +174,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_tax_query_cat_action_tax() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // tax + cat with tax added

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Taxonomy + category with taxonomy added.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->go_to( home_url( "/testtax/tax-slug2/?cat=$this->cat_id" ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertQueryTrue( 'is_category', 'is_tax', 'is_archive' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEmpty( get_query_var( 'tax_query' ) );

</span></span></pre></div>

<a id="trunktestsphpunittestsquerymetaQueryphp"></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/query/metaQuery.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/query/metaQuery.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/query/metaQuery.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1563,7 +1563,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 16829

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_meta_default_compare() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // compare should default to IN when meta_value is an array

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Compare should default to IN when meta_value is an array.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post_id = self::factory()->post->create();

</span><span class="cx" style="display: block; padding: 0 10px">                add_post_meta( $post_id, 'foo', 'bar' );

</span><span class="cx" style="display: block; padding: 0 10px">                $post_id2 = self::factory()->post->create();

</span></span></pre></div>

<a id="trunktestsphpunittestsqueryresultsphp"></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/query/results.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/query/results.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/query/results.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -304,7 +304,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_query_default() {

</span><span class="cx" style="display: block; padding: 0 10px">                $posts = $this->q->query( '' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // the output should be the most recent 10 posts as listed here

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // The output should be the most recent 10 posts as listed here.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $expected = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        0 => 'tags-a-and-c',

</span><span class="cx" style="display: block; padding: 0 10px">                        1 => 'tags-b-and-c',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -324,7 +324,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_query_tag_a() {

</span><span class="cx" style="display: block; padding: 0 10px">                $posts = $this->q->query( 'tag=tag-a' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // there are 4 posts with Tag A

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // There are 4 posts with Tag A.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertCount( 4, $posts );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'tags-a-and-c', $posts[0]->post_name );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'tags-a-and-b', $posts[1]->post_name );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -335,7 +335,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_query_tag_b() {

</span><span class="cx" style="display: block; padding: 0 10px">                $posts = $this->q->query( 'tag=tag-b' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // there are 4 posts with Tag A

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // There are 4 posts with Tag A.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertCount( 4, $posts );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'tags-b-and-c', $posts[0]->post_name );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'tags-a-and-b', $posts[1]->post_name );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -349,7 +349,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_query_tag_nun() {

</span><span class="cx" style="display: block; padding: 0 10px">                $posts = $this->q->query( 'tag=tag-נ' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // there is 1 post with Tag נ

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // There is 1 post with Tag נ.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertCount( 1, $posts );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'tag-%d7%a0', $posts[0]->post_name );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -358,7 +358,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $tag   = tag_exists( 'tag-a' );

</span><span class="cx" style="display: block; padding: 0 10px">                $posts = $this->q->query( 'tag_id=' . $tag['term_id'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // there are 4 posts with Tag A

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // There are 4 posts with Tag A.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertCount( 4, $posts );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'tags-a-and-c', $posts[0]->post_name );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'tags-a-and-b', $posts[1]->post_name );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -369,7 +369,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_query_tag_slug__in() {

</span><span class="cx" style="display: block; padding: 0 10px">                $posts = $this->q->query( 'tag_slug__in[]=tag-b&tag_slug__in[]=tag-c' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // there are 4 posts with either Tag B or Tag C

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // There are 4 posts with either Tag B or Tag C.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertCount( 6, $posts );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'tags-a-and-c', $posts[0]->post_name );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'tags-b-and-c', $posts[1]->post_name );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -385,7 +385,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $tag_b = tag_exists( 'tag-b' );

</span><span class="cx" style="display: block; padding: 0 10px">                $posts = $this->q->query( 'tag__in[]=' . $tag_a['term_id'] . '&tag__in[]=' . $tag_b['term_id'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // there are 6 posts with either Tag A or Tag B

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // There are 6 posts with either Tag A or Tag B.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertCount( 6, $posts );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'tags-a-and-c', $posts[0]->post_name );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'tags-b-and-c', $posts[1]->post_name );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -399,8 +399,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $tag_a = tag_exists( 'tag-a' );

</span><span class="cx" style="display: block; padding: 0 10px">                $posts = $this->q->query( 'tag__not_in[]=' . $tag_a['term_id'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // the most recent 10 posts with Tag A excluded

-               // (note the different between this and test_query_default)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // The most recent 10 posts with Tag A excluded

+               // (note the different between this and test_query_default).

</ins><span class="cx" style="display: block; padding: 0 10px">                 $expected = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        0 => 'tags-b-and-c',

</span><span class="cx" style="display: block; padding: 0 10px">                        1 => 'tag-c',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -422,7 +422,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $tag_b = tag_exists( 'tag-b' );

</span><span class="cx" style="display: block; padding: 0 10px">                $posts = $this->q->query( 'tag__in[]=' . $tag_a['term_id'] . '&tag__not_in[]=' . $tag_b['term_id'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // there are 4 posts with Tag A, only 2 when we exclude Tag B

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // There are 4 posts with Tag A, only 2 when we exclude Tag B.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertCount( 2, $posts );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'tags-a-and-c', $posts[0]->post_name );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'tag-a', $posts[1]->post_name );

</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">        function test_query_category_name() {

</span><span class="cx" style="display: block; padding: 0 10px">                $posts = $this->q->query( 'category_name=cat-a' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // there are 4 posts with Cat A, we'll check for them by name

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // There are 4 posts with Cat A, we'll check for them by name.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertCount( 4, $posts );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'cat-a', $posts[0]->post_name );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'cats-a-and-c', $posts[1]->post_name );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -445,7 +445,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $cat   = category_exists( 'cat-b' );

</span><span class="cx" style="display: block; padding: 0 10px">                $posts = $this->q->query( "cat=$cat" );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // there are 4 posts with Cat B

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // There are 4 posts with Cat B.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertCount( 4, $posts );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'cat-b', $posts[0]->post_name );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'cats-b-and-c', $posts[1]->post_name );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -528,7 +528,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 11056

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_query_post_parent__in() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Query for first parent's children

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Query for first parent's children.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $posts = $this->q->query(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_parent__in' => array( self::$parent_one ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -545,7 +545,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        wp_list_pluck( $posts, 'post_title' )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Second parent's children

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Second parent's children.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $posts = $this->q->query(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_parent__in' => array( self::$parent_two ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -562,7 +562,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        wp_list_pluck( $posts, 'post_title' )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Both first and second parent's children

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Both first and second parent's children.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $posts = $this->q->query(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_parent__in' => array( self::$parent_one, self::$parent_two ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -581,7 +581,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        wp_list_pluck( $posts, 'post_title' )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Third parent's children

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Third parent's children.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $posts = $this->q->query(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_parent__in' => array( self::$parent_three ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -629,7 +629,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // order=desc does not influence the order of returned results (returns same order as order=asc)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // 'order=desc' does not influence the order of returned results (returns same order as 'order=asc').

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $expected_returned_array, wp_list_pluck( $posts, 'post_title' ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -648,7 +648,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">-                // Expect post ids in the same order as post__in array when no 'order' param is passed in

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Expect post IDs in the same order as post__in array when no 'order' param is passed in.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertSame( $expected_returned_array, $q->posts );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -668,7 +668,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Expect post ids in the same order as post__in array when order=asc is passed in

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Expect post IDs in the same order as post__in array when order=asc is passed in.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertSame( $expected_returned_array, $q->posts );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -688,8 +688,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Note that results are returned in the order specified in the post__in array

-               // Order=desc does not have an effect on the order of returned results

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Note that results are returned in the order specified in the post__in array.

+               // 'order=desc' does not influence the order of returned results.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertSame( $expected_returned_array, $q->posts );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -724,7 +724,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // order=desc does not influence the order of returned results (returns same order as order=asc)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // 'order=desc' does not influence the order of returned results (returns same order as 'order=asc').

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertSame( $post_name__in_array, array_unique( wp_list_pluck( $q->posts, 'post_title' ) ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunktestsphpunittestsquerysearchphp"></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/query/search.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/query/search.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/query/search.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,7 +80,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_disable_search_exclusion_prefix() {

</span><span class="cx" style="display: block; padding: 0 10px">                $title = '-HYPHENATION_TEST';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Create a post with a title which starts with a hyphen

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create a post with a title which starts with a hyphen.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post_id = self::factory()->post->create(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_content' => $title,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -88,10 +88,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // By default, we can use the hyphen prefix to exclude results

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // By default, we can use the hyphen prefix to exclude results.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( array(), $this->get_search_results( $title ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // After we disable the feature using the filter, we should get the result

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // After we disable the feature using the filter, we should get the result.

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_filter( 'wp_query_search_exclusion_prefix', '__return_false' );

</span><span class="cx" style="display: block; padding: 0 10px">                $result = $this->get_search_results( $title );

</span><span class="cx" style="display: block; padding: 0 10px">                $post   = array_pop( $result );

</span></span></pre></div>

<a id="trunktestsphpunittestsquerytaxQueryphp"></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/query/taxQuery.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/query/taxQuery.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/query/taxQuery.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -994,11 +994,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * An empty tax query should return an empty array, not all posts.

+        *

</ins><span class="cx" style="display: block; padding: 0 10px">          * @ticket 20604

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_tax_query_relation_or_both_clauses_empty_terms() {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // An empty tax query should return an empty array, not all posts.

-

</del><span class="cx" style="display: block; padding: 0 10px">                 self::factory()->post->create_many( 2 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $query = new WP_Query(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1029,11 +1029,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * An empty tax query should return an empty array, not all posts.

+        *

</ins><span class="cx" style="display: block; padding: 0 10px">          * @ticket 20604

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_tax_query_relation_or_one_clause_empty_terms() {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // An empty tax query should return an empty array, not all posts.

-

</del><span class="cx" style="display: block; padding: 0 10px">                 self::factory()->post->create_many( 2 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $query = new WP_Query(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1301,12 +1301,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $cats = array();

</span><span class="cx" style="display: block; padding: 0 10px">                $tags = array();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // need term_taxonomy_ids in addition to term_ids, so no factory

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Need term_taxonomy_ids in addition to term_ids, so no factory.

</ins><span class="cx" style="display: block; padding: 0 10px">                 for ( $i = 0; $i < 5; $i++ ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $cats[ $i ] = wp_insert_term( 'category-' . $i, 'category' );

</span><span class="cx" style="display: block; padding: 0 10px">                        $tags[ $i ] = wp_insert_term( 'tag-' . $i, 'post_tag' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // post 0 gets all terms

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Post 0 gets all terms.

</ins><span class="cx" style="display: block; padding: 0 10px">                         wp_set_object_terms( $posts[0], array( $cats[ $i ]['term_id'] ), 'category', true );

</span><span class="cx" style="display: block; padding: 0 10px">                        wp_set_object_terms( $posts[0], array( $tags[ $i ]['term_id'] ), 'post_tag', true );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1394,13 +1394,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $q = new WP_Query(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'tax_query' => array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Empty terms mean that this one should be skipped

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Empty terms mean that this one should be skipped.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                                'taxonomy' => 'bar',

</span><span class="cx" style="display: block; padding: 0 10px">                                                'terms'    => array(),

</span><span class="cx" style="display: block; padding: 0 10px">                                        ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Category and post tags should be skipped

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Category and post tags should be skipped.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                                'taxonomy' => 'category',

</span><span class="cx" style="display: block; padding: 0 10px">                                                'terms'    => array( $c ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1518,19 +1518,19 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $q = new WP_Query(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'tax_query' => array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Non-category should be skipped

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Non-category should be skipped.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                                'taxonomy' => 'foo',

</span><span class="cx" style="display: block; padding: 0 10px">                                                'terms'    => array( $t ),

</span><span class="cx" style="display: block; padding: 0 10px">                                        ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Empty terms mean that this one should be skipped

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Empty terms mean that this one should be skipped.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                                'taxonomy' => 'category',

</span><span class="cx" style="display: block; padding: 0 10px">                                                'terms'    => array(),

</span><span class="cx" style="display: block; padding: 0 10px">                                        ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Category and post tags should be skipped

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Category and post tags should be skipped.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                                'taxonomy' => 'category',

</span><span class="cx" style="display: block; padding: 0 10px">                                                'terms'    => array( $c ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1565,19 +1565,19 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $q = new WP_Query(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'tax_query' => array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Non-tag should be skipped

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Non-tag should be skipped.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                                'taxonomy' => 'foo',

</span><span class="cx" style="display: block; padding: 0 10px">                                                'terms'    => array( $t ),

</span><span class="cx" style="display: block; padding: 0 10px">                                        ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Empty terms mean that this one should be skipped

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Empty terms mean that this one should be skipped.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                                'taxonomy' => 'post_tag',

</span><span class="cx" style="display: block; padding: 0 10px">                                                'terms'    => array(),

</span><span class="cx" style="display: block; padding: 0 10px">                                        ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // Category and post tags should be skipped

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Category and post tags should be skipped.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                                'taxonomy' => 'post_tag',

</span><span class="cx" style="display: block; padding: 0 10px">                                                'terms'    => array( $tag ),

</span></span></pre></div>

<a id="trunktestsphpunittestsrestapirestattachmentscontrollerphp"></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-attachments-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-attachments-controller.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/rest-api/rest-attachments-controller.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -87,12 +87,12 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        public static function disposition_provider() {

</span><span class="cx" style="display: block; padding: 0 10px">                return array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Types

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Types.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( 'attachment; filename="foo.jpg"', 'foo.jpg' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( 'inline; filename="foo.jpg"', 'foo.jpg' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( 'form-data; filename="foo.jpg"', 'foo.jpg' ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Formatting

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Formatting.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( 'attachment; filename="foo.jpg"', 'foo.jpg' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( 'attachment; filename=foo.jpg', 'foo.jpg' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( 'attachment;filename="foo.jpg"', 'foo.jpg' ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -103,13 +103,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        array( "attachment;\tfilename\t=\tfoo.jpg", 'foo.jpg' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( 'attachment; filename = my foo picture.jpg', 'my foo picture.jpg' ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Extensions

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Extensions.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( 'form-data; name="myfile"; filename="foo.jpg"', 'foo.jpg' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( 'form-data; name="myfile"; filename="foo.jpg"; something="else"', 'foo.jpg' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( 'form-data; name=myfile; filename=foo.jpg; something=else', 'foo.jpg' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( 'form-data; name=myfile; filename=my foo.jpg; something=else', 'my foo.jpg' ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Invalid

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Invalid.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( 'filename="foo.jpg"', null ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( 'filename-foo.jpg', null ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( 'foo.jpg', null ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -127,13 +127,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">        public function test_context_param() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Collection

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Collection.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $request  = new WP_REST_Request( 'OPTIONS', '/wp/v2/media' );

</span><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">                $this->assertEquals( 'view', $data['endpoints'][0]['args']['context']['default'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array( 'view', 'embed', 'edit' ), $data['endpoints'][0]['args']['context']['enum'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Single

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Single.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $attachment_id = $this->factory->attachment->create_object(

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->test_file,

</span><span class="cx" style="display: block; padding: 0 10px">                        0,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -329,11 +329,11 @@

</span><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">                $this->assertEquals( $id1, $data[0]['id'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // media_type=video

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // 'media_type' => 'video'.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $request->set_param( 'media_type', 'video' );

</span><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">                $this->assertCount( 0, $response->get_data() );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // media_type=image

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // 'media_type' => 'image'.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $request->set_param( 'media_type', 'image' );

</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -352,11 +352,11 @@

</span><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">                $this->assertEquals( $id1, $data[0]['id'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // mime_type=image/png

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // 'mime_type' => 'image/png'.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $request->set_param( 'mime_type', 'image/png' );

</span><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">                $this->assertCount( 0, $response->get_data() );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // mime_type=image/jpeg

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // 'mime_type' => 'image/jpeg'.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $request->set_param( 'mime_type', 'image/jpeg' );

</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -381,18 +381,18 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_excerpt'   => 'A sample caption',

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // all attachments

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // All attachments.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $request  = new WP_REST_Request( 'GET', '/wp/v2/media' );

</span><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">                $this->assertEquals( 2, count( $response->get_data() ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $request = new WP_REST_Request( 'GET', '/wp/v2/media' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // attachments without a parent

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Attachments without a parent.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $request->set_param( 'parent', 0 );

</span><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">                $this->assertEquals( 1, count( $data ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $attachment_id2, $data[0]['id'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // attachments with parent=post_id

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Attachments with parent=post_id.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $request = new WP_REST_Request( 'GET', '/wp/v2/media' );

</span><span class="cx" style="display: block; padding: 0 10px">                $request->set_param( 'parent', $post_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $response = rest_get_server()->dispatch( $request );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -399,7 +399,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $data     = $response->get_data();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 1, count( $data ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $attachment_id, $data[0]['id'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // attachments with invalid parent

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Attachments with invalid parent.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $request = new WP_REST_Request( 'GET', '/wp/v2/media' );

</span><span class="cx" style="display: block; padding: 0 10px">                $request->set_param( 'parent', REST_TESTS_IMPOSSIBLY_HIGH_NUMBER );

</span><span class="cx" style="display: block; padding: 0 10px">                $response = rest_get_server()->dispatch( $request );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -427,7 +427,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">        public function test_get_items_private_status() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Logged out users can't make the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Logged out users can't make the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_set_current_user( 0 );

</span><span class="cx" style="display: block; padding: 0 10px">                $attachment_id1 = $this->factory->attachment->create_object(

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->test_file,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -442,7 +442,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $request->set_param( 'status', 'private' );

</span><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">                $this->assertErrorResponse( 'rest_invalid_param', $response, 400 );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Properly authorized users can make the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Properly authorized users can make the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_set_current_user( self::$editor_id );

</span><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">                $this->assertEquals( 200, $response->get_status() );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -451,7 +451,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">        public function test_get_items_multiple_statuses() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Logged out users can't make the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Logged out users can't make the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_set_current_user( 0 );

</span><span class="cx" style="display: block; padding: 0 10px">                $attachment_id1 = $this->factory->attachment->create_object(

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->test_file,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -475,7 +475,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $request->set_param( 'status', array( 'private', 'trash' ) );

</span><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">                $this->assertErrorResponse( 'rest_invalid_param', $response, 400 );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Properly authorized users can make the request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Properly authorized users can make the request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_set_current_user( self::$editor_id );

</span><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">                $this->assertEquals( 200, $response->get_status() );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -968,7 +968,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">        public function verify_attachment_roundtrip( $input = array(), $expected_output = array() ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Create the post

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create the post.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $request = new WP_REST_Request( 'POST', '/wp/v2/media' );

</span><span class="cx" style="display: block; padding: 0 10px">                $request->set_header( 'Content-Type', 'image/jpeg' );

</span><span class="cx" style="display: block; padding: 0 10px">                $request->set_header( 'Content-Disposition', 'attachment; filename=canola.jpg' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -981,8 +981,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 201, $response->get_status() );

</span><span class="cx" style="display: block; padding: 0 10px">                $actual_output = $response->get_data();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Remove <p class="attachment"> from rendered description

-               // see https://core.trac.wordpress.org/ticket/38679

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Remove <p class="attachment"> from rendered description.

+               // See https://core.trac.wordpress.org/ticket/38679

</ins><span class="cx" style="display: block; padding: 0 10px">                 $content = $actual_output['description']['rendered'];

</span><span class="cx" style="display: block; padding: 0 10px">                $content = explode( "\n", trim( $content ) );

</span><span class="cx" style="display: block; padding: 0 10px">                if ( preg_match( '/^<p class="attachment">/', $content[0] ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -990,7 +990,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $actual_output['description']['rendered'] = $content;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Compare expected API output to actual API output

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Compare expected API output to actual API output.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $expected_output['title']['raw'], $actual_output['title']['raw'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected_output['title']['rendered'], trim( $actual_output['title']['rendered'] ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected_output['description']['raw'], $actual_output['description']['raw'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -998,13 +998,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected_output['caption']['raw'], $actual_output['caption']['raw'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected_output['caption']['rendered'], trim( $actual_output['caption']['rendered'] ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Compare expected API output to WP internal values

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Compare expected API output to WP internal values.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post = get_post( $actual_output['id'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected_output['title']['raw'], $post->post_title );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected_output['description']['raw'], $post->post_content );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected_output['caption']['raw'], $post->post_excerpt );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Update the post

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Update the post.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/media/%d', $actual_output['id'] ) );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $input as $name => $value ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $request->set_param( $name, $value );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1013,8 +1013,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 200, $response->get_status() );

</span><span class="cx" style="display: block; padding: 0 10px">                $actual_output = $response->get_data();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Remove <p class="attachment"> from rendered description

-               // see https://core.trac.wordpress.org/ticket/38679

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Remove <p class="attachment"> from rendered description.

+               // See https://core.trac.wordpress.org/ticket/38679

</ins><span class="cx" style="display: block; padding: 0 10px">                 $content = $actual_output['description']['rendered'];

</span><span class="cx" style="display: block; padding: 0 10px">                $content = explode( "\n", trim( $content ) );

</span><span class="cx" style="display: block; padding: 0 10px">                if ( preg_match( '/^<p class="attachment">/', $content[0] ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1022,7 +1022,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $actual_output['description']['rendered'] = $content;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Compare expected API output to actual API output

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Compare expected API output to actual API output.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $expected_output['title']['raw'], $actual_output['title']['raw'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected_output['title']['rendered'], trim( $actual_output['title']['rendered'] ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected_output['description']['raw'], $actual_output['description']['raw'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1030,7 +1030,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected_output['caption']['raw'], $actual_output['caption']['raw'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected_output['caption']['rendered'], trim( $actual_output['caption']['rendered'] ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Compare expected API output to WP internal values

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Compare expected API output to WP internal values.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post = get_post( $actual_output['id'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected_output['title']['raw'], $post->post_title );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected_output['description']['raw'], $post->post_content );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1247,7 +1247,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">-                // Attempt trashing

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Attempt trashing.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $request  = new WP_REST_Request( 'DELETE', '/wp/v2/media/' . $attachment_id );

</span><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">                $this->assertErrorResponse( 'rest_trash_not_supported', $response, 501 );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1256,7 +1256,7 @@

</span><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">                $this->assertErrorResponse( 'rest_trash_not_supported', $response, 501 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Ensure the post still exists

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Ensure the post still exists.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post = get_post( $attachment_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEmpty( $post );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span></span></pre></div>

<a id="trunktestsphpunittestsrestapirestcategoriescontrollerphp"></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-categories-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-categories-controller.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/rest-api/rest-categories-controller.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -113,13 +113,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">        public function test_context_param() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Collection

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Collection.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $request  = new WP_REST_Request( 'OPTIONS', '/wp/v2/categories' );

</span><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">                $this->assertEquals( 'view', $data['endpoints'][0]['args']['context']['default'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEqualSets( array( 'view', 'embed', 'edit' ), $data['endpoints'][0]['args']['context']['enum'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Single

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Single.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $category1 = $this->factory->category->create( array( 'name' => 'Season 5' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $request   = new WP_REST_Request( 'OPTIONS', '/wp/v2/categories/' . $category1 );

</span><span class="cx" style="display: block; padding: 0 10px">                $response  = rest_get_server()->dispatch( $request );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -441,7 +441,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $data = $response->get_data();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 3, count( $data ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check ordered by name by default

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check ordered by name by default.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $names = wp_list_pluck( $data, 'name' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array( 'DC', 'Image', 'Marvel' ), $names );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -449,7 +449,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_get_items_post_ordered_by_description() {

</span><span class="cx" style="display: block; padding: 0 10px">                $post_id = $this->post_with_categories();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Regular request

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Regular request.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $request = new WP_REST_Request( 'GET', '/wp/v2/categories' );

</span><span class="cx" style="display: block; padding: 0 10px">                $request->set_param( 'post', $post_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $request->set_param( 'orderby', 'description' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -461,7 +461,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $names = wp_list_pluck( $data, 'name' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array( 'Image', 'Marvel', 'DC' ), $names, 'Terms should be ordered by description' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Flip the order

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Flip the order.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $request->set_param( 'order', 'desc' );

</span><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">                $this->assertEquals( 200, $response->get_status() );

</span></span></pre></div>

<a id="trunktestsphpunittestsrestapirestcommentscontrollerphp"></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-comments-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-comments-controller.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/rest-api/rest-comments-controller.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -168,13 +168,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">        public function test_context_param() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Collection

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Collection.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $request  = new WP_REST_Request( 'OPTIONS', '/wp/v2/comments' );

</span><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">                $this->assertEquals( 'view', $data['endpoints'][0]['args']['context']['default'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array( 'view', 'embed', 'edit' ), $data['endpoints'][0]['args']['context']['enum'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Single

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Single.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $request  = new WP_REST_Request( 'OPTIONS', '/wp/v2/comments/' . self::$approved_id );

</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -979,10 +979,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 96, $data['author_avatar_urls'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $comment = get_comment( self::$approved_id );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                /**

-                * Ignore the subdomain, since 'get_avatar_url randomly sets the Gravatar

-                * server when building the url string.

-                */

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Ignore the subdomain, since get_avatar_url() randomly sets

+               // the Gravatar server when building the URL string.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( substr( get_avatar_url( $comment->comment_author_email ), 9 ), substr( $data['author_avatar_urls'][96], 9 ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1565,7 +1563,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $data = $response->get_data();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $user_id, $data['author'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check author data matches

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check author data matches.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $author  = get_user_by( 'id', $user_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $comment = get_comment( $data['id'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $author->display_name, $comment->comment_author );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2072,8 +2070,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">        public function anonymous_comments_callback_null() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // I'm a plugin developer who forgot to include a return value for some

-               // code path in my 'rest_allow_anonymous_comments' filter.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // I'm a plugin developer who forgot to include a return value

+               // for some code path in my 'rest_allow_anonymous_comments' filter.

</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_allow_anonymous_comments_null() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2332,8 +2330,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/comments/%d', self::$approved_id ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $request->set_param( 'post', $comment->comment_post_ID );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Run twice to make sure that the update still succeeds even if no DB

-               // rows are updated.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Run twice to make sure that the update still succeeds

+               // even if no DB rows are updated.

</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">                $this->assertEquals( 200, $response->get_status() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2793,7 +2791,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">        public function verify_comment_roundtrip( $input = array(), $expected_output = array() ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Create the comment

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create the comment.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $request = new WP_REST_Request( 'POST', '/wp/v2/comments' );

</span><span class="cx" style="display: block; padding: 0 10px">                $request->set_param( 'author_email', 'cbg@androidsdungeon.com' );

</span><span class="cx" style="display: block; padding: 0 10px">                $request->set_param( 'post', self::$post_id );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2804,7 +2802,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 201, $response->get_status() );

</span><span class="cx" style="display: block; padding: 0 10px">                $actual_output = $response->get_data();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Compare expected API output to actual API output

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Compare expected API output to actual API output.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertInternalType( 'array', $actual_output['content'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'raw', $actual_output['content'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected_output['content']['raw'], $actual_output['content']['raw'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2812,18 +2810,18 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected_output['author_name'], $actual_output['author_name'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected_output['author_user_agent'], $actual_output['author_user_agent'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Compare expected API output to WP internal values

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Compare expected API output to WP internal values.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $comment = get_comment( $actual_output['id'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected_output['content']['raw'], $comment->comment_content );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected_output['author_name'], $comment->comment_author );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected_output['author_user_agent'], $comment->comment_agent );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Update the comment

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Update the comment.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/comments/%d', $actual_output['id'] ) );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $input as $name => $value ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $request->set_param( $name, $value );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // FIXME at least one value must change, or update fails

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // FIXME At least one value must change, or update fails.

</ins><span class="cx" style="display: block; padding: 0 10px">                 // See https://core.trac.wordpress.org/ticket/38700

</span><span class="cx" style="display: block; padding: 0 10px">                $request->set_param( 'author_ip', '127.0.0.2' );

</span><span class="cx" style="display: block; padding: 0 10px">                $response = rest_get_server()->dispatch( $request );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2830,13 +2828,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 200, $response->get_status() );

</span><span class="cx" style="display: block; padding: 0 10px">                $actual_output = $response->get_data();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Compare expected API output to actual API output

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Compare expected API output to actual API output.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $expected_output['content']['raw'], $actual_output['content']['raw'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected_output['content']['rendered'], trim( $actual_output['content']['rendered'] ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected_output['author_name'], $actual_output['author_name'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected_output['author_user_agent'], $actual_output['author_user_agent'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Compare expected API output to WP internal values

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Compare expected API output to WP internal values.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $comment = get_comment( $actual_output['id'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected_output['content']['raw'], $comment->comment_content );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected_output['author_name'], $comment->comment_author );

</span></span></pre></div>

<a id="trunktestsphpunittestsrestapirestpagescontrollerphp"></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-pages-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-pages-controller.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/rest-api/rest-pages-controller.php        2020-01-29 00:43:23 UTC (rev 47122)

</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">                parent::setUp();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->has_setup_template = false;

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'theme_page_templates', array( $this, 'filter_theme_page_templates' ) );

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // reregister the route as we now have a template available.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Re-register the route as we now have a template available.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $GLOBALS['wp_rest_server']->override_by_default = true;

</span><span class="cx" style="display: block; padding: 0 10px">                $controller                                     = new WP_REST_Posts_Controller( 'page' );

</span><span class="cx" style="display: block; padding: 0 10px">                $controller->register_routes();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -45,13 +45,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">        public function test_context_param() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Collection

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Collection.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $request  = new WP_REST_Request( 'OPTIONS', '/wp/v2/pages' );

</span><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">                $this->assertEquals( 'view', $data['endpoints'][0]['args']['context']['default'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array( 'view', 'embed', 'edit' ), $data['endpoints'][0]['args']['context']['enum'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Single

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Single.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $page_id  = $this->factory->post->create( array( 'post_type' => 'page' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $request  = new WP_REST_Request( 'OPTIONS', '/wp/v2/pages/' . $page_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $response = rest_get_server()->dispatch( $request );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -286,7 +286,7 @@

</span><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">                $this->assertErrorResponse( 'rest_invalid_param', $response, 400 );

</span><span class="cx" style="display: block; padding: 0 10px">                $data = $response->get_data();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Safe format for 4.4 and 4.5 https://core.trac.wordpress.org/ticket/35028

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Safe format for 4.4 and 4.5. See https://core.trac.wordpress.org/ticket/35028

</ins><span class="cx" style="display: block; padding: 0 10px">                 $first_error = array_shift( $data['data']['params'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertContains( 'per_page must be between 1 (inclusive) and 100 (inclusive)', $first_error );

</span><span class="cx" style="display: block; padding: 0 10px">                $request->set_param( 'per_page', 101 );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -298,7 +298,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_get_items_private_filter_query_var() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Private query vars inaccessible to unauthorized users

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Private query vars inaccessible to unauthorized users.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_set_current_user( 0 );

</span><span class="cx" style="display: block; padding: 0 10px">                $page_id  = $this->factory->post->create(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -317,7 +317,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $response = rest_get_server()->dispatch( $request );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertErrorResponse( 'rest_invalid_param', $response, 400 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // But they are accessible to authorized users

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // But they are accessible to authorized users.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_set_current_user( self::$editor_id );

</span><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></pre></div>

<a id="trunktestsphpunittestsrestapirestpostmetafieldsphp"></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-post-meta-fields.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-post-meta-fields.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/rest-api/rest-post-meta-fields.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1538,7 +1538,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'meta' => array(

</span><span class="cx" style="display: block; padding: 0 10px">                                        'list_of_objects' => array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                // Meta 1

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         // Meta 1.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                 array(

</span><span class="cx" style="display: block; padding: 0 10px">                                                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                                                'version' => '5.2',

</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">                                                                'artist'  => 'Betty',

</span><span class="cx" style="display: block; padding: 0 10px">                                                        ),

</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 2

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         // Meta 2.

</ins><span class="cx" style="display: block; padding: 0 10px">                                                 array(

</span><span class="cx" style="display: block; padding: 0 10px">                                                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                                                'version' => '4.9',

</span></span></pre></div>

<a id="trunktestsphpunittestsrestapirestpoststatusescontrollerphp"></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-post-statuses-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-post-statuses-controller.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/rest-api/rest-post-statuses-controller.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,13 +18,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">        public function test_context_param() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Collection

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Collection.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $request  = new WP_REST_Request( 'OPTIONS', '/wp/v2/statuses' );

</span><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">                $this->assertEquals( 'view', $data['endpoints'][0]['args']['context']['default'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEqualSets( array( 'embed', 'view', 'edit' ), $data['endpoints'][0]['args']['context']['enum'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Single

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Single.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $request  = new WP_REST_Request( 'OPTIONS', '/wp/v2/statuses/publish' );

</span><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></pre></div>

<a id="trunktestsphpunittestsrestapirestposttypescontrollerphp"></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-post-types-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-post-types-controller.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/rest-api/rest-post-types-controller.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,13 +18,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">        public function test_context_param() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Collection

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Collection.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $request  = new WP_REST_Request( 'OPTIONS', '/wp/v2/types' );

</span><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">                $this->assertEquals( 'view', $data['endpoints'][0]['args']['context']['default'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEqualSets( array( 'view', 'edit', 'embed' ), $data['endpoints'][0]['args']['context']['enum'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Single

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Single.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $request  = new WP_REST_Request( 'OPTIONS', '/wp/v2/types/post' );

</span><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></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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/rest-api/rest-posts-controller.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -61,7 +61,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        update_site_option( 'site_admins', array( 'superadmin' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Only support 'post' and 'gallery'

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Only support 'post' and 'gallery'.

</ins><span class="cx" style="display: block; padding: 0 10px">                 self::$supported_formats = get_theme_support( 'post-formats' );

</span><span class="cx" style="display: block; padding: 0 10px">                add_theme_support( 'post-formats', array( 'post', 'gallery' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -150,13 +150,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">        public function test_context_param() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Collection

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Collection.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $request  = new WP_REST_Request( 'OPTIONS', '/wp/v2/posts' );

</span><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">                $this->assertEquals( 'view', $data['endpoints'][0]['args']['context']['default'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array( 'view', 'embed', 'edit' ), $data['endpoints'][0]['args']['context']['enum'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Single

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Single.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $request  = new WP_REST_Request( 'OPTIONS', '/wp/v2/posts/' . self::$post_id );

</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -1454,7 +1454,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 39061

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_get_items_invalid_max_pages() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Out of bounds

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Out of bounds.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );

</span><span class="cx" style="display: block; padding: 0 10px">                $request->set_param( 'page', REST_TESTS_IMPOSSIBLY_HIGH_NUMBER );

</span><span class="cx" style="display: block; padding: 0 10px">                $response = rest_get_server()->dispatch( $request );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2050,7 +2050,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'theme_post_templates', array( $this, 'filter_theme_post_templates' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // reregister the route as we now have a template available.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Re-register the route as we now have a template available.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $GLOBALS['wp_rest_server']->override_by_default = true;

</span><span class="cx" style="display: block; padding: 0 10px">                $controller                                     = new WP_REST_Posts_Controller( 'post' );

</span><span class="cx" style="display: block; padding: 0 10px">                $controller->register_routes();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2152,8 +2152,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $request = new WP_REST_Request( 'POST', '/wp/v2/posts' );

</span><span class="cx" style="display: block; padding: 0 10px">                $params  = $this->set_post_data(

</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">-                                // This results in a special `post_date_gmt` value of

-                               // '0000-00-00 00:00:00'.  See #38883.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // This results in a special `post_date_gmt` value

+                               // of '0000-00-00 00:00:00'. See #38883.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'status' => 'pending',

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2252,7 +2252,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $new_post = get_post( $data['id'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'draft', $data['status'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'draft', $new_post->post_status );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Confirm dates are shimmed for gmt_offset

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Confirm dates are shimmed for gmt_offset.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post_modified_gmt = gmdate( 'Y-m-d H:i:s', strtotime( $new_post->post_modified ) + ( get_option( 'gmt_offset' ) * 3600 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $post_date_gmt     = gmdate( 'Y-m-d H:i:s', strtotime( $new_post->post_date ) + ( get_option( 'gmt_offset' ) * 3600 ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2775,8 +2775,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/posts/%d', self::$post_id ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $request->set_param( 'author', $post->post_author );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Run twice to make sure that the update still succeeds even if no DB

-               // rows are updated.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Run twice to make sure that the update still succeeds

+               // even if no DB rows are updated.

</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">                $this->check_update_post_response( $response );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3224,7 +3224,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $post = get_post( $new_data['id'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( true, is_sticky( $post->ID ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Updating another field shouldn't change sticky status

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Updating another field shouldn't change sticky status.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/posts/%d', self::$post_id ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $params  = $this->set_post_data(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3564,7 +3564,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        public function verify_post_roundtrip( $input = array(), $expected_output = array() ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Create the post

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create the post.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $request = new WP_REST_Request( 'POST', '/wp/v2/posts' );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $input as $name => $value ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $request->set_param( $name, $value );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3573,7 +3573,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 201, $response->get_status() );

</span><span class="cx" style="display: block; padding: 0 10px">                $actual_output = $response->get_data();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Compare expected API output to actual API output

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Compare expected API output to actual API output.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $expected_output['title']['raw'], $actual_output['title']['raw'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected_output['title']['rendered'], trim( $actual_output['title']['rendered'] ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected_output['content']['raw'], $actual_output['content']['raw'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3581,13 +3581,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected_output['excerpt']['raw'], $actual_output['excerpt']['raw'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected_output['excerpt']['rendered'], trim( $actual_output['excerpt']['rendered'] ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Compare expected API output to WP internal values

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Compare expected API output to WP internal values.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post = get_post( $actual_output['id'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected_output['title']['raw'], $post->post_title );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected_output['content']['raw'], $post->post_content );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected_output['excerpt']['raw'], $post->post_excerpt );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Update the post

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Update the post.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/posts/%d', $actual_output['id'] ) );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $input as $name => $value ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $request->set_param( $name, $value );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3596,7 +3596,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 200, $response->get_status() );

</span><span class="cx" style="display: block; padding: 0 10px">                $actual_output = $response->get_data();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Compare expected API output to actual API output

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Compare expected API output to actual API output.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $expected_output['title']['raw'], $actual_output['title']['raw'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected_output['title']['rendered'], trim( $actual_output['title']['rendered'] ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected_output['content']['raw'], $actual_output['content']['raw'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3604,7 +3604,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected_output['excerpt']['raw'], $actual_output['excerpt']['raw'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected_output['excerpt']['rendered'], trim( $actual_output['excerpt']['rendered'] ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Compare expected API output to WP internal values

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Compare expected API output to WP internal values.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post = get_post( $actual_output['id'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected_output['title']['raw'], $post->post_title );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected_output['content']['raw'], $post->post_content );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3927,7 +3927,7 @@

<span class="cx" style="display: block; padding: 0 10px">                // Register a taxonomy with 'status' as name.

</span><span class="cx" style="display: block; padding: 0 10px">                register_taxonomy( 'status', 'post', array( 'show_in_rest' => 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">-                // Re-initialize the controller

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Re-initialize the controller.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $controller = new WP_REST_Posts_Controller( 'post' );

</span><span class="cx" style="display: block; padding: 0 10px">                $controller->register_routes();

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4538,7 +4538,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $request->set_param( 'context', 'edit' );

</span><span class="cx" style="display: block; padding: 0 10px">                $response = rest_do_request( $request );

</span><span class="cx" style="display: block; padding: 0 10px">                $links    = $response->get_links();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Authors can't ever unfiltered html

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Authors can't ever unfiltered html.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertArrayNotHasKey( 'https://api.w.org/action-unfiltered-html', $links );

</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="trunktestsphpunittestsrestapirestrevisionscontrollerphp"></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-revisions-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-revisions-controller.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/rest-api/rest-revisions-controller.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,13 +106,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">        public function test_context_param() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Collection

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Collection.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $request  = new WP_REST_Request( 'OPTIONS', '/wp/v2/posts/' . self::$post_id . '/revisions' );

</span><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">                $this->assertEquals( 'view', $data['endpoints'][0]['args']['context']['default'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEqualSets( array( 'view', 'edit', 'embed' ), $data['endpoints'][0]['args']['context']['enum'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Single

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Single.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $request  = new WP_REST_Request( 'OPTIONS', '/wp/v2/posts/' . self::$post_id . '/revisions/' . $this->revision_1->ID );

</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,7 +128,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 200, $response->get_status() );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertCount( $this->total_revisions, $data );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Reverse chron

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Reverse chronology.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $this->revision_id3, $data[0]['id'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->check_get_revision_response( $data[0], $this->revision_3 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -281,7 +281,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $response = rest_get_server()->dispatch( $request );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertErrorResponse( 'rest_trash_not_supported', $response, 501 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Ensure the revision still exists

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Ensure the revision still exists.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertNotNull( get_post( $this->revision_id1 ) );

</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="trunktestsphpunittestsrestapirestserverphp"></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-server.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-server.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/rest-api/rest-server.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,7 +13,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function setUp() {

</span><span class="cx" style="display: block; padding: 0 10px">                parent::setUp();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Reset REST server to ensure only our routes are registered

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Reset REST server to ensure only our routes are registered.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $GLOBALS['wp_rest_server'] = null;

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'wp_rest_server_class', array( $this, 'filter_wp_rest_server_class' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $GLOBALS['wp_rest_server'] = rest_get_server();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,7 +21,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        public function tearDown() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Remove our temporary spy server

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Remove our temporary spy server.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $GLOBALS['wp_rest_server'] = null;

</span><span class="cx" style="display: block; padding: 0 10px">                unset( $_REQUEST['_wpnonce'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -909,7 +909,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $value, $headers[ $header ] );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Last-Modified should be unset as per #WP23021

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Last-Modified should be unset as per #WP23021.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( isset( $headers['Last-Modified'] ), 'Last-Modified should not be sent.' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -962,7 +962,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">-                // WordPress internally will slash the superglobals on bootstrap

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // WordPress internally will slash the superglobals on bootstrap.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_GET = wp_slash(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'data' => 'data\\with\\slashes',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -990,7 +990,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">-                // WordPress internally will slash the superglobals on bootstrap

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // WordPress internally will slash the superglobals on bootstrap.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_POST = wp_slash(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'data' => 'data\\with\\slashes',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1047,7 +1047,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">-                // WordPress internally will slash the superglobals on bootstrap

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // WordPress internally will slash the superglobals on bootstrap.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_FILES = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'data' => array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'name' => 'data\\with\\slashes',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1075,7 +1075,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">-                // WordPress internally will slash the superglobals on bootstrap

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // WordPress internally will slash the superglobals on bootstrap.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_SERVER['HTTP_X_MY_HEADER'] = wp_slash( 'data\\with\\slashes' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $result = rest_get_server()->serve_request( '/test/data\\with\\slashes' );

</span></span></pre></div>

<a id="trunktestsphpunittestsrestapirestsettingscontrollerphp"></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-settings-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-settings-controller.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/rest-api/rest-settings-controller.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -104,7 +104,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_get_item_value_is_cast_to_type() {

</span><span class="cx" style="display: block; padding: 0 10px">                wp_set_current_user( self::$administrator );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                update_option( 'posts_per_page', 'invalid_number' ); // this is cast to (int) 1

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         update_option( 'posts_per_page', 'invalid_number' ); // This is cast to (int) 1.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $request  = new WP_REST_Request( 'GET', '/wp/v2/settings' );

</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -182,7 +182,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $data     = $response->get_data();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array(), $data['mycustomsetting'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Invalid value

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Invalid value.

</ins><span class="cx" style="display: block; padding: 0 10px">                 update_option( 'mycustomsetting', array( array( 1 ) ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $request  = new WP_REST_Request( 'GET', '/wp/v2/settings' );

</span><span class="cx" style="display: block; padding: 0 10px">                $response = rest_get_server()->dispatch( $request );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -189,7 +189,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $data     = $response->get_data();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( null, $data['mycustomsetting'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // No option value

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // No option value.

</ins><span class="cx" style="display: block; padding: 0 10px">                 delete_option( 'mycustomsetting' );

</span><span class="cx" style="display: block; padding: 0 10px">                $request  = new WP_REST_Request( 'GET', '/wp/v2/settings' );

</span><span class="cx" style="display: block; padding: 0 10px">                $response = rest_get_server()->dispatch( $request );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -238,7 +238,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $data     = $response->get_data();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array(), $data['mycustomsetting'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Invalid value

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Invalid value.

</ins><span class="cx" style="display: block; padding: 0 10px">                 update_option(

</span><span class="cx" style="display: block; padding: 0 10px">                        'mycustomsetting',

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -379,7 +379,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        public function update_setting_custom_callback( $result, $name, $value, $args ) {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( 'title' === $name && 'The new title!' === $value ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Do not allow changing the title in this case

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Do not allow changing the title in this case.

</ins><span class="cx" style="display: block; padding: 0 10px">                         return true;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunktestsphpunittestsrestapiresttagscontrollerphp"></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-tags-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-tags-controller.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/rest-api/rest-tags-controller.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -131,13 +131,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">        public function test_context_param() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Collection

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Collection.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $request  = new WP_REST_Request( 'OPTIONS', '/wp/v2/tags' );

</span><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">                $this->assertEquals( 'view', $data['endpoints'][0]['args']['context']['default'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEqualSets( array( 'view', 'embed', 'edit' ), $data['endpoints'][0]['args']['context']['enum'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Single

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Single.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $tag1     = $this->factory->tag->create( array( 'name' => 'Season 5' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $request  = new WP_REST_Request( 'OPTIONS', '/wp/v2/tags/' . $tag1 );

</span><span class="cx" style="display: block; padding: 0 10px">                $response = rest_get_server()->dispatch( $request );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -887,8 +887,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 200, $response->get_status() );

</span><span class="cx" style="display: block; padding: 0 10px">                $request->set_param( 'slug', $term->slug );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Run twice to make sure that the update still succeeds even if no DB

-               // rows are updated.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Run twice to make sure that the update still succeeds

+               // even if no DB rows are updated.

</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">                $this->assertEquals( 200, $response->get_status() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -980,7 +980,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">        public function verify_tag_roundtrip( $input = array(), $expected_output = array() ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Create the tag

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create the tag.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $request = new WP_REST_Request( 'POST', '/wp/v2/tags' );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $input as $name => $value ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $request->set_param( $name, $value );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -989,16 +989,16 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 201, $response->get_status() );

</span><span class="cx" style="display: block; padding: 0 10px">                $actual_output = $response->get_data();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Compare expected API output to actual API output

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Compare expected API output to actual API output.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $expected_output['name'], $actual_output['name'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected_output['description'], $actual_output['description'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Compare expected API output to WP internal values

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Compare expected API output to WP internal values.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $tag = get_term_by( 'id', $actual_output['id'], 'post_tag' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected_output['name'], $tag->name );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected_output['description'], $tag->description );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Update the tag

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Update the tag.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/tags/%d', $actual_output['id'] ) );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $input as $name => $value ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $request->set_param( $name, $value );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1007,11 +1007,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 200, $response->get_status() );

</span><span class="cx" style="display: block; padding: 0 10px">                $actual_output = $response->get_data();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Compare expected API output to actual API output

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Compare expected API output to actual API output.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $expected_output['name'], $actual_output['name'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected_output['description'], $actual_output['description'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Compare expected API output to WP internal values

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Compare expected API output to WP internal values.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $tag = get_term_by( 'id', $actual_output['id'], 'post_tag' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected_output['name'], $tag->name );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected_output['description'], $tag->description );

</span></span></pre></div>

<a id="trunktestsphpunittestsrestapiresttaxonomiescontrollerphp"></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-taxonomies-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-taxonomies-controller.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/rest-api/rest-taxonomies-controller.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,13 +33,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">        public function test_context_param() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Collection

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Collection.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $request  = new WP_REST_Request( 'OPTIONS', '/wp/v2/taxonomies' );

</span><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">                $this->assertEquals( 'view', $data['endpoints'][0]['args']['context']['default'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEqualSets( array( 'view', 'edit', 'embed' ), $data['endpoints'][0]['args']['context']['enum'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Single

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Single.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $request  = new WP_REST_Request( 'OPTIONS', '/wp/v2/taxonomies/post_tag' );

</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -246,7 +246,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * Utility function to filter down to only public taxonomies

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        private function get_public_taxonomies( $taxonomies ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Pass through array_values to re-index after filtering

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Pass through array_values to re-index after filtering.

</ins><span class="cx" style="display: block; padding: 0 10px">                 return array_values( array_filter( $taxonomies, array( $this, 'is_public' ) ) );

</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="trunktestsphpunittestsrestapirestuserscontrollerphp"></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-users-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-users-controller.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/rest-api/rest-users-controller.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -164,13 +164,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">        public function test_context_param() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Collection

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Collection.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $request  = new WP_REST_Request( 'OPTIONS', '/wp/v2/users' );

</span><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">                $this->assertEquals( 'view', $data['endpoints'][0]['args']['context']['default'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array( 'view', 'embed', 'edit' ), $data['endpoints'][0]['args']['context']['enum'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Single

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Single.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $request  = new WP_REST_Request( 'OPTIONS', '/wp/v2/users/' . self::$user );

</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -663,7 +663,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $request->set_param( 'search', 'yololololo' );

</span><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">                $this->assertEquals( 1, count( $response->get_data() ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // default to wildcard search

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Default to wildcard search.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $adam_id = $this->factory->user->create(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'role'          => 'author',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -788,7 +788,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array( 'taco', 'enchilada', 'burrito' ), $slugs );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Note: Do not test using editor role as there is an editor role created in testing and it makes it hard to test this functionality.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**

+        * Note: Do not test using editor role as there is an editor role created in testing,

+        * and it makes it hard to test this functionality.

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         public function test_get_items_roles() {

</span><span class="cx" style="display: block; padding: 0 10px">                wp_set_current_user( self::$user );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -947,10 +950,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 96, $data['avatar_urls'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $user = get_user_by( 'id', self::$editor );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                /**

-                * Ignore the subdomain, since 'get_avatar_url randomly sets the Gravatar

-                * server when building the url string.

-                */

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Ignore the subdomain, since get_avatar_url() randomly sets

+               // the Gravatar server when building the URL string.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( substr( get_avatar_url( $user->user_email ), 9 ), substr( $data['avatar_urls'][96], 9 ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1196,7 +1197,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'url'         => 'http://example.com',

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Username rules are different (more strict) for multisite; see `wpmu_validate_user_signup`

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Username rules are different (more strict) for multisite; see `wpmu_validate_user_signup`.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( is_multisite() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $params['username'] = 'no-dashes-allowed';

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1521,7 +1522,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->check_add_edit_user_response( $response, 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">-                // Check that the name has been updated correctly

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check that the name has been updated correctly.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $new_data = $response->get_data();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'New Name', $new_data['first_name'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $user = get_userdata( $user_id );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1546,8 +1547,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/users/%d', self::$editor ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $request->set_param( 'slug', $user->user_nicename );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Run twice to make sure that the update still succeeds even if no DB

-               // rows are updated.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Run twice to make sure that the update still succeeds

+               // even if no DB rows are updated.

</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">                $this->assertEquals( 200, $response->get_status() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1768,7 +1769,7 @@

</span><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">                $this->check_add_edit_user_response( $response, 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">-                // Check that the name has been updated correctly

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check that the name has been updated correctly.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $new_data = $response->get_data();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'JSON Name', $new_data['first_name'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'New Last', $new_data['last_name'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2035,11 +2036,12 @@

</span><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"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( is_multisite() ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Site administrators can promote users, as verified by the

-                       // previous test, but they cannot perform other user-editing

-                       // operations.  This also tests the branch of logic that verifies

-                       // that no parameters other than 'id' and 'roles' are specified for

-                       // a roles update.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 /*

+                        * Site administrators can promote users, as verified by the previous test,

+                        * but they cannot perform other user-editing operations.

+                        * This also tests the branch of logic that verifies that no parameters

+                        * other than 'id' and 'roles' are specified for a roles update.

+                        */

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertErrorResponse( 'rest_cannot_edit', $response, 403 );

</span><span class="cx" style="display: block; padding: 0 10px">                } else {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( 200, $response->get_status() );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2066,10 +2068,10 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        public function verify_user_roundtrip( $input = array(), $expected_output = array() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( isset( $input['id'] ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Existing user; don't try to create one

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Existing user; don't try to create one.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $user_id = $input['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">-                        // Create a new user

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Create a new user.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $request = new WP_REST_Request( 'POST', '/wp/v2/users' );

</span><span class="cx" style="display: block; padding: 0 10px">                        foreach ( $input as $name => $value ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $request->set_param( $name, $value );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2079,7 +2081,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( 201, $response->get_status() );

</span><span class="cx" style="display: block; padding: 0 10px">                        $actual_output = $response->get_data();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Compare expected API output to actual API output

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Compare expected API output to actual API output.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertEquals( $expected_output['username'], $actual_output['username'] );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $expected_output['name'], $actual_output['name'] );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $expected_output['first_name'], $actual_output['first_name'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2088,7 +2090,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $expected_output['description'], $actual_output['description'] );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $expected_output['nickname'], $actual_output['nickname'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Compare expected API output to WP internal values

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Compare expected API output to WP internal values.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $user = get_userdata( $actual_output['id'] );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $expected_output['username'], $user->user_login );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $expected_output['name'], $user->display_name );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2102,7 +2104,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $user_id = $actual_output['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">-                // Update the user

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Update the user.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/users/%d', $user_id ) );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $input as $name => $value ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( 'username' !== $name ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2113,7 +2115,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 200, $response->get_status() );

</span><span class="cx" style="display: block; padding: 0 10px">                $actual_output = $response->get_data();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Compare expected API output to actual API output

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Compare expected API output to actual API output.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( isset( $expected_output['username'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $expected_output['username'], $actual_output['username'] );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2124,7 +2126,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected_output['description'], $actual_output['description'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected_output['nickname'], $actual_output['nickname'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Compare expected API output to WP internal values

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Compare expected API output to WP internal values.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $user = get_userdata( $actual_output['id'] );

</span><span class="cx" style="display: block; padding: 0 10px">                if ( isset( $expected_output['username'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $expected_output['username'], $user->user_login );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2387,7 +2389,7 @@

</span><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">                $this->assertErrorResponse( 'rest_trash_not_supported', $response, 501 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Ensure the user still exists

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Ensure the user still exists.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $user = get_user_by( 'id', $user_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEmpty( $user );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2459,7 +2461,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 200, $response->get_status() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check that the post has been updated correctly

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check that the post has been updated correctly.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post = get_post( $test_post );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $reassign_id, $post->post_author );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span></span></pre></div>

<a id="trunktestsphpunittestsrestapiphp"></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.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/rest-api.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -316,9 +316,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * The 'methods' arg should a comma seperated string.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * The 'methods' arg should a comma-separated string.

</ins><span class="cx" style="display: block; padding: 0 10px">          */

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        public function test_route_method_comma_seperated() {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_route_method_comma_separated() {

</ins><span class="cx" style="display: block; padding: 0 10px">                 register_rest_route(

</span><span class="cx" style="display: block; padding: 0 10px">                        'test-ns',

</span><span class="cx" style="display: block; padding: 0 10px">                        '/test',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -708,32 +708,32 @@

</span><span class="cx" style="display: block; padding: 0 10px">                set_current_screen( 'edit.php' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( is_admin() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test an HTTP URL

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test an HTTP URL.

</ins><span class="cx" style="display: block; padding: 0 10px">                 unset( $_SERVER['HTTPS'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $url = get_rest_url();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( 'http', parse_url( $url, PHP_URL_SCHEME ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test an HTTPS URL

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test an HTTPS URL.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_SERVER['HTTPS'] = 'on';

</span><span class="cx" style="display: block; padding: 0 10px">                $url              = get_rest_url();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( 'https', parse_url( $url, PHP_URL_SCHEME ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Switch to an admin request on a different domain name

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Switch to an admin request on a different domain name.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_SERVER['SERVER_NAME'] = 'admin.example.org';

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'siteurl', 'http://admin.example.org' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEquals( $_SERVER['SERVER_NAME'], parse_url( home_url(), PHP_URL_HOST ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // // Test an HTTP URL

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test an HTTP URL.

</ins><span class="cx" style="display: block; padding: 0 10px">                 unset( $_SERVER['HTTPS'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $url = get_rest_url();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( 'http', parse_url( $url, PHP_URL_SCHEME ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // // Test an HTTPS URL

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test an HTTPS URL.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_SERVER['HTTPS'] = 'on';

</span><span class="cx" style="display: block; padding: 0 10px">                $url              = get_rest_url();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( 'http', parse_url( $url, PHP_URL_SCHEME ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Reset

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Reset.

</ins><span class="cx" style="display: block; padding: 0 10px">                 update_option( 'siteurl', $_siteurl );

</span><span class="cx" style="display: block; padding: 0 10px">                set_current_screen( 'front' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -768,13 +768,13 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        public function jsonp_callback_provider() {

</span><span class="cx" style="display: block; padding: 0 10px">                return array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Standard names

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Standard names.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( 'Springfield', true ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( 'shelby.ville', true ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( 'cypress_creek', true ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( 'KampKrusty1', 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">-                        // Invalid names

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Invalid names.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( 'ogden-ville', false ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( 'north haverbrook', false ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( "Terror['Lake']", false ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -793,7 +793,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        public function rest_date_provider() {

</span><span class="cx" style="display: block; padding: 0 10px">                return array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Valid dates with timezones

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Valid dates with timezones.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( '2017-01-16T11:30:00-05:00', gmmktime( 11, 30, 0, 1, 16, 2017 ) + 5 * HOUR_IN_SECONDS ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '2017-01-16T11:30:00-05:30', gmmktime( 11, 30, 0, 1, 16, 2017 ) + 5.5 * HOUR_IN_SECONDS ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '2017-01-16T11:30:00-05', gmmktime( 11, 30, 0, 1, 16, 2017 ) + 5 * HOUR_IN_SECONDS ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -802,10 +802,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '2017-01-16T11:30:00+00', gmmktime( 11, 30, 0, 1, 16, 2017 ) ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '2017-01-16T11:30:00Z', gmmktime( 11, 30, 0, 1, 16, 2017 ) ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Valid dates without timezones

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Valid dates without timezones.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( '2017-01-16T11:30:00', gmmktime( 11, 30, 0, 1, 16, 2017 ) ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Invalid dates (TODO: support parsing partial dates as ranges, see #38641)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Invalid dates (TODO: support parsing partial dates as ranges, see #38641).

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( '2017-01-16T11:30:00-5', false ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '2017-01-16T11:30', false ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '2017-01-16T11', false ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -825,7 +825,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        public function rest_date_force_utc_provider() {

</span><span class="cx" style="display: block; padding: 0 10px">                return array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Valid dates with timezones

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Valid dates with timezones.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( '2017-01-16T11:30:00-05:00', gmmktime( 11, 30, 0, 1, 16, 2017 ) ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '2017-01-16T11:30:00-05:30', gmmktime( 11, 30, 0, 1, 16, 2017 ) ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '2017-01-16T11:30:00-05', gmmktime( 11, 30, 0, 1, 16, 2017 ) ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -834,10 +834,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '2017-01-16T11:30:00+00', gmmktime( 11, 30, 0, 1, 16, 2017 ) ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '2017-01-16T11:30:00Z', gmmktime( 11, 30, 0, 1, 16, 2017 ) ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Valid dates without timezones

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Valid dates without timezones.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( '2017-01-16T11:30:00', gmmktime( 11, 30, 0, 1, 16, 2017 ) ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Invalid dates (TODO: support parsing partial dates as ranges, see #38641)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Invalid dates (TODO: support parsing partial dates as ranges, see #38641).

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( '2017-01-16T11:30:00-5', false ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '2017-01-16T11:30', false ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array( '2017-01-16T11', false ),

</span></span></pre></div>

<a id="trunktestsphpunittestsrewritenumericSlugsphp"></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/rewrite/numericSlugs.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rewrite/numericSlugs.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/rewrite/numericSlugs.php  2020-01-29 00:43:23 UTC (rev 47122)

</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">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Force an ID that resembles a year format

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Force an ID that resembles a year format.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $wpdb->update(

</span><span class="cx" style="display: block; padding: 0 10px">                        $wpdb->posts,

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,7 +65,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Force an ID that resembles a year format

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Force an ID that resembles a year format.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $wpdb->update(

</span><span class="cx" style="display: block; padding: 0 10px">                        $wpdb->posts,

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span></span></pre></div>

<a id="trunktestsphpunittestsrewritephp"></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/rewrite.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rewrite.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/rewrite.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -143,11 +143,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                // Cleanup.

</span><span class="cx" style="display: block; padding: 0 10px">                remove_filter( 'home_url', array( $this, '_filter_http_home_url' ), 10 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test the tests:

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test the tests.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertSame( 'http', parse_url( $permalink, PHP_URL_SCHEME ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( 'https', parse_url( $network_home, PHP_URL_SCHEME ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test that the url_to_postid() call matched:

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test that the url_to_postid() call matched.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $post_id, $url_to_postid );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -371,7 +371,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</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 url should NOT return a post ID

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // This url should NOT return a post ID.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $badurl = site_url( '/example-collision' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 0, url_to_postid( $badurl ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -392,7 +392,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // This url should NOT return a post ID

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // This url should NOT return a post ID.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $badurl = network_home_url( '/example-collision' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 0, url_to_postid( $badurl ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunktestsphpunittestsshortcodephp"></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/shortcode.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/shortcode.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/shortcode.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -293,13 +293,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $out = do_shortcode( '[[baztag foo="bar"]the content[/baztag]]' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( '[baztag foo="bar"]the content[/baztag]', $out );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // double escaped

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Double escaped.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = do_shortcode( '[[[footag]]] [[[bartag foo="bar"]]]' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( '[[footag]] [[bartag foo="bar"]]', $out );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_tag_not_escaped() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // these have square brackets on either end but aren't actually escaped

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // These have square brackets on either end but aren't actually escaped.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = do_shortcode( '[[footag] [bartag foo="bar"]]' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( '[foo =  foo = bar]', $out );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -357,7 +357,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 6562

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_utf8_whitespace_1() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // NO-BREAK SPACE: U+00A0

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // NO-BREAK SPACE: U+00A0.

</ins><span class="cx" style="display: block; padding: 0 10px">                 do_shortcode( "[test-shortcode-tag foo=\"bar\" \xC2\xA0baz=\"123\"]" );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -373,7 +373,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 6562

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_utf8_whitespace_2() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // ZERO WIDTH SPACE: U+200B

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // ZERO WIDTH SPACE: U+200B.

</ins><span class="cx" style="display: block; padding: 0 10px">                 do_shortcode( "[test-shortcode-tag foo=\"bar\" \xE2\x80\x8Babc=\"def\"]" );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -389,7 +389,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 14050

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_shortcode_unautop() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // a blank line is added at the end, so test with it already there

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // A blank line is added at the end, so test with it already there.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $test_string = "[footag]\n";

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $test_string, shortcode_unautop( wpautop( $test_string ) ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -434,7 +434,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                return array( '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">-        // Store passed in shortcode_atts_{$shortcode} args

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Store passed in shortcode_atts_{$shortcode} args.

</ins><span class="cx" style="display: block; padding: 0 10px">         function _filter_atts( $out, $pairs, $atts ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $this->filter_atts_out   = $out;

</span><span class="cx" style="display: block; padding: 0 10px">                $this->filter_atts_pairs = $pairs;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -442,14 +442,14 @@

</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="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Filter shortcode atts in various ways

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Filter shortcode atts in various ways.

</ins><span class="cx" style="display: block; padding: 0 10px">         function _filter_atts2( $out, $pairs, $atts ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If foo attribute equals "foo1", change it to be default value

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If foo attribute equals "foo1", change it to be default value.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( isset( $out['foo'] ) && 'foo1' === $out['foo'] ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $out['foo'] = $pairs['foo'];

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If baz attribute is set, remove it

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If baz attribute is set, remove it.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( isset( $out['baz'] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        unset( $out['baz'] );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -618,7 +618,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">                        array(

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                '<div [gallery]>', // Shortcodes will never be stripped inside elements.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         '<div [gallery]>',   // Shortcodes will never be stripped inside elements.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 '<div [gallery]>',

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -781,23 +781,23 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 37906

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_pre_do_shortcode_tag() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // does nothing if no filters are set up

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Does nothing if no filters are set up.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $str = 'pre_do_shortcode_tag';

</span><span class="cx" style="display: block; padding: 0 10px">                add_shortcode( $str, array( $this, '_shortcode_pre_do_shortcode_tag' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $result_nofilter = do_shortcode( "[{$str}]" );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( 'foo', $result_nofilter );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // short-circuit with filter

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Short-circuit with filter.

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_filter( 'pre_do_shortcode_tag', array( $this, '_filter_pre_do_shortcode_tag_bar' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $result_filter = do_shortcode( "[{$str}]" );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( 'bar', $result_filter );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // respect priority

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Respect priority.

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_filter( 'pre_do_shortcode_tag', array( $this, '_filter_pre_do_shortcode_tag_p11' ), 11 );

</span><span class="cx" style="display: block; padding: 0 10px">                $result_priority = do_shortcode( "[{$str}]" );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( 'p11', $result_priority );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // pass arguments

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Pass arguments.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $arr = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'return' => 'p11',

</span><span class="cx" style="display: block; padding: 0 10px">                        'key'    => $str,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -851,23 +851,23 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 32790

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_do_shortcode_tag_filter() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // does nothing if no filters are set up

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Does nothing if no filters are set up.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $str = 'do_shortcode_tag';

</span><span class="cx" style="display: block; padding: 0 10px">                add_shortcode( $str, array( $this, '_shortcode_do_shortcode_tag' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $result_nofilter = do_shortcode( "[{$str}]" );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( 'foo', $result_nofilter );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // modify output with filter

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Modify output with filter.

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_filter( 'do_shortcode_tag', array( $this, '_filter_do_shortcode_tag_replace' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $result_filter = do_shortcode( "[{$str}]" );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( 'fee', $result_filter );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // respect priority

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Respect priority.

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_filter( 'do_shortcode_tag', array( $this, '_filter_do_shortcode_tag_generate' ), 11 );

</span><span class="cx" style="display: block; padding: 0 10px">                $result_priority = do_shortcode( "[{$str}]" );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( 'foobar', $result_priority );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // pass arguments

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Pass arguments.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $arr = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'return' => 'foobar',

</span><span class="cx" style="display: block; padding: 0 10px">                        'key'    => $str,

</span></span></pre></div>

<a id="trunktestsphpunitteststaxonomyphp"></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/taxonomy.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/taxonomy.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/taxonomy.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,7 +16,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 5417

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_get_unknown_taxonomies() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // taxonomies for an unknown object type

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Taxonomies for an unknown object type.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( array(), get_object_taxonomies( rand_str() ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array(), get_object_taxonomies( '' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array(), get_object_taxonomies( 0 ) );

</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">        function test_get_post_taxonomy() {

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( get_object_taxonomies( 'post' ) as $taxonomy ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $tax = get_taxonomy( $taxonomy );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // should return an object with the correct taxonomy object type

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Should return an object with the correct taxonomy object type.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertTrue( is_object( $tax ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertTrue( is_array( $tax->object_type ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( array( 'post' ), $tax->object_type );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -108,7 +108,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_get_link_taxonomy() {

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( get_object_taxonomies( 'link' ) as $taxonomy ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $tax = get_taxonomy( $taxonomy );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // should return an object with the correct taxonomy object type

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Should return an object with the correct taxonomy object type.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertTrue( is_object( $tax ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertTrue( is_array( $tax->object_type ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( array( 'link' ), $tax->object_type );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -143,7 +143,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_register_taxonomy() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // make up a new taxonomy name, and ensure it's unused

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make up a new taxonomy name, and ensure it's unused.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $tax = rand_str();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( taxonomy_exists( $tax ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -151,13 +151,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( taxonomy_exists( $tax ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( is_taxonomy_hierarchical( $tax ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // clean up

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Clean up.

</ins><span class="cx" style="display: block; padding: 0 10px">                 unset( $GLOBALS['wp_taxonomies'][ $tax ] );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_register_hierarchical_taxonomy() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // make up a new taxonomy name, and ensure it's unused

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make up a new taxonomy name, and ensure it's unused.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $tax = rand_str();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( taxonomy_exists( $tax ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -165,7 +165,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( taxonomy_exists( $tax ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( is_taxonomy_hierarchical( $tax ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // clean up

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Clean up.

</ins><span class="cx" style="display: block; padding: 0 10px">                 unset( $GLOBALS['wp_taxonomies'][ $tax ] );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -218,43 +218,43 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 11058

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_registering_taxonomies_to_object_types() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Create a taxonomy to test with

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create a taxonomy to test with.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $tax = 'test_tax';

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( taxonomy_exists( $tax ) );

</span><span class="cx" style="display: block; padding: 0 10px">                register_taxonomy( $tax, 'post', array( 'hierarchical' => 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">-                // Create a post type to test with

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create a post type to test with.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post_type = 'test_cpt';

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( get_post_type( $post_type ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertObjectHasAttribute( 'name', register_post_type( $post_type ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Core taxonomy, core post type

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Core taxonomy, core post type.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( unregister_taxonomy_for_object_type( 'category', 'post' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( unregister_taxonomy_for_object_type( 'category', 'post' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( register_taxonomy_for_object_type( 'category', '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">-                // Core taxonomy, non-core post type

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Core taxonomy, non-core post type.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( register_taxonomy_for_object_type( 'category', $post_type ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( unregister_taxonomy_for_object_type( 'category', $post_type ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( unregister_taxonomy_for_object_type( 'category', $post_type ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( register_taxonomy_for_object_type( 'category', $post_type ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Core taxonomies, non-post object types

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Core taxonomies, non-post object types.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( register_taxonomy_for_object_type( 'category', 'user' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( unregister_taxonomy_for_object_type( 'category', 'user' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Non-core taxonomy, core post type

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Non-core taxonomy, core post type.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( unregister_taxonomy_for_object_type( $tax, 'post' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( unregister_taxonomy_for_object_type( $tax, 'post' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( register_taxonomy_for_object_type( $tax, '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">-                // Non-core taxonomy, non-core post type

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Non-core taxonomy, non-core post type.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( register_taxonomy_for_object_type( $tax, $post_type ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( unregister_taxonomy_for_object_type( $tax, $post_type ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( unregister_taxonomy_for_object_type( $tax, $post_type ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( register_taxonomy_for_object_type( $tax, $post_type ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Non-core taxonomies, non-post object types

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Non-core taxonomies, non-post object types.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( register_taxonomy_for_object_type( $tax, 'user' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( unregister_taxonomy_for_object_type( $tax, 'user' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -396,12 +396,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_in_category() {

</span><span class="cx" style="display: block; padding: 0 10px">                $post = self::factory()->post->create_and_get();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // in_category() returns false when first parameter is empty()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // in_category() returns false when first parameter is empty().

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( in_category( '', $post ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( in_category( false, $post ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( in_category( null, $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">-                // Test expected behavior of in_category()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test expected behavior of in_category().

</ins><span class="cx" style="display: block; padding: 0 10px">                 $term = wp_insert_term( 'Test', 'category' );

</span><span class="cx" style="display: block; padding: 0 10px">                wp_set_object_terms( $post->ID, $term['term_id'], 'category' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( in_category( $term['term_id'], $post ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -947,7 +947,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_type' => 'post',

</span><span class="cx" style="display: block; padding: 0 10px">                                'tax_input' => array(

</span><span class="cx" style="display: block; padding: 0 10px">                                        $taxonomy_name => array(

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                (string) $term_id, // Cast term_id as string to match whats sent in WP Admin.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         (string) $term_id, // Cast term_id as string to match what's sent in WP Admin.

</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="trunktestsphpunitteststermcachephp"></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/cache.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/cache.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/term/cache.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,7 +14,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 25711

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_category_children_cache() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test with only one Parent => Child

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test with only one Parent => Child.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $term_id1       = self::factory()->category->create();

</span><span class="cx" style="display: block; padding: 0 10px">                $term_id1_child = self::factory()->category->create( array( 'parent' => $term_id1 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $hierarchy      = _get_term_hierarchy( 'category' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,7 +21,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array( $term_id1 => array( $term_id1_child ) ), $hierarchy );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Add another Parent => Child

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Add another Parent => Child.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $term_id2       = self::factory()->category->create();

</span><span class="cx" style="display: block; padding: 0 10px">                $term_id2_child = self::factory()->category->create( array( 'parent' => $term_id2 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $hierarchy      = _get_term_hierarchy( 'category' );

</span></span></pre></div>

<a id="trunktestsphpunitteststermgetTermsphp"></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/getTerms.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/getTerms.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/term/getTerms.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -113,7 +113,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $num_queries = $wpdb->num_queries;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // last_changed and num_queries should bump

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // last_changed and num_queries should bump.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $terms = get_terms( 'post_tag', array( 'update_term_meta_cache' => false ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 3, count( $terms ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $time1 = wp_cache_get( 'last_changed', 'terms' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -137,7 +137,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->set_up_three_posts_and_tags();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Prime cache

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Prime cache.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $terms       = get_terms( 'post_tag' );

</span><span class="cx" style="display: block; padding: 0 10px">                $time1       = wp_cache_get( 'last_changed', 'terms' );

</span><span class="cx" style="display: block; padding: 0 10px">                $num_queries = $wpdb->num_queries;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -165,7 +165,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->set_up_three_posts_and_tags();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Prime cache

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Prime cache.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $terms       = get_terms( 'post_tag' );

</span><span class="cx" style="display: block; padding: 0 10px">                $time1       = wp_cache_get( 'last_changed', 'terms' );

</span><span class="cx" style="display: block; padding: 0 10px">                $num_queries = $wpdb->num_queries;

</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">         * @ticket 27123

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_get_term_children_recursion() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Assume there is a way to insert a term with the parent pointing to itself

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Assume there is a way to insert a term with the parent pointing to itself.

</ins><span class="cx" style="display: block; padding: 0 10px">                 // See: https://core.trac.wordpress.org/changeset/15806

</span><span class="cx" style="display: block; padding: 0 10px">                remove_filter( 'wp_update_term_parent', 'wp_check_term_hierarchy_for_loops', 10 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -926,7 +926,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEqualSets( array( $t ), $found );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // array format.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Array format.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $found = get_terms(

</span><span class="cx" style="display: block; padding: 0 10px">                        'wptests_tax',

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1025,7 +1025,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                Montreal

</span><span class="cx" style="display: block; padding: 0 10px">                        PEI

</span><span class="cx" style="display: block; padding: 0 10px">                */

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Level 1

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Level 1.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $canada = self::factory()->term->create(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'name'     => 'Canada',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1033,7 +1033,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">-                // Level 2

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Level 2.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $ontario = self::factory()->term->create(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'name'     => 'Ontario',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1056,7 +1056,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">-                // Level 3

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Level 3.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $toronto  = self::factory()->term->create(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'name'     => 'Toronto',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1079,7 +1079,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Level 4

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Level 4.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $nepean = self::factory()->term->create(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'name'     => 'Nepean',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1107,7 +1107,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $tax = 'location';

</span><span class="cx" style="display: block; padding: 0 10px">                register_taxonomy( $tax, 'post', array( 'hierarchical' => 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">-                // Level 1

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Level 1.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $canada = self::factory()->term->create(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'name'     => 'Canada',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1115,7 +1115,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Level 2

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Level 2.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $ontario = self::factory()->term->create(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'name'     => 'Ontario',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1131,7 +1131,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Level 3

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Level 3.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $laval    = self::factory()->term->create(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'name'     => 'Laval',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1147,7 +1147,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">-                // Level 4

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Level 4.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $dorval = self::factory()->term->create(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'name'     => 'Dorval',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2221,7 +2221,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_hierarchical_false_with_parent() {

</span><span class="cx" style="display: block; padding: 0 10px">                $initial_terms = $this->create_hierarchical_terms();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Case where hierarchical is false

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Case where hierarchical is false.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $terms = get_terms(

</span><span class="cx" style="display: block; padding: 0 10px">                        'category',

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2230,7 +2230,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">-                // Verify that there are no children

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Verify that there are no children.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 0, count( $terms ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2240,7 +2240,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_hierarchical_true_with_parent() {

</span><span class="cx" style="display: block; padding: 0 10px">                $initial_terms = $this->create_hierarchical_terms();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Case where hierarchical is true

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Case where hierarchical is true.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $terms = get_terms(

</span><span class="cx" style="display: block; padding: 0 10px">                        'category',

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2249,7 +2249,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Verify that the children with non-empty descendants are returned

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Verify that the children with non-empty descendants are returned.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $expected = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        $initial_terms['two_term']['term_id'],

</span><span class="cx" style="display: block; padding: 0 10px">                        $initial_terms['five_term']['term_id'],

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2267,7 +2267,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'category'

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Case where hierarchical is false

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Case where hierarchical is false.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $terms = get_terms(

</span><span class="cx" style="display: block; padding: 0 10px">                        'category',

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2287,7 +2287,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_hierarchical_false_with_child_of_should_not_return_grandchildren() {

</span><span class="cx" style="display: block; padding: 0 10px">                $initial_terms = $this->create_hierarchical_terms();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Case where hierarchical is false

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Case where hierarchical is false.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $terms = get_terms(

</span><span class="cx" style="display: block; padding: 0 10px">                        'category',

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2296,7 +2296,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">-                // Verify that there are no children

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Verify that there are no children.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 0, count( $terms ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2303,7 +2303,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_hierarchical_true_with_child_of_should_return_grandchildren() {

</span><span class="cx" style="display: block; padding: 0 10px">                $initial_terms = $this->create_hierarchical_terms();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Case where hierarchical is true

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Case where hierarchical is true.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $terms = get_terms(

</span><span class="cx" style="display: block; padding: 0 10px">                        'category',

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2399,7 +2399,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_hierarchical_false_parent_should_override_child_of() {

</span><span class="cx" style="display: block; padding: 0 10px">                $initial_terms = $this->create_hierarchical_terms();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Case where hierarchical is false

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Case where hierarchical is false.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $terms = get_terms(

</span><span class="cx" style="display: block; padding: 0 10px">                        'category',

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2409,7 +2409,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"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // hierarchical=false means that descendants are not fetched.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // 'hierarchical=false' means that descendants are not fetched.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 0, count( $terms ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2419,7 +2419,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_hierarchical_true_parent_overrides_child_of() {

</span><span class="cx" style="display: block; padding: 0 10px">                $initial_terms = $this->create_hierarchical_terms();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Case where hierarchical is true

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Case where hierarchical is true.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $terms = get_terms(

</span><span class="cx" style="display: block; padding: 0 10px">                        'category',

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2429,7 +2429,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">-                // Verify that parent takes precedence over child_of

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Verify that parent takes precedence over child_of.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $expected = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        $initial_terms['two_term']['term_id'],

</span><span class="cx" style="display: block; padding: 0 10px">                        $initial_terms['five_term']['term_id'],

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2997,14 +2997,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">        protected function create_hierarchical_terms() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set up the following hierarchy:

-               // - One

-               //   - Two

-               //     - Three (1)

-               //     - Four

-               //   - Five

-               //     - Six (1)

-               //   - Seven

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /*

+                * Set up the following hierarchy:

+                * - One

+                *   - Two

+                *     - Three (1)

+                *     - Four

+                *   - Five

+                *     - Six (1)

+                *   - Seven

+                */

</ins><span class="cx" style="display: block; padding: 0 10px">                 $one_term   = wp_insert_term(

</span><span class="cx" style="display: block; padding: 0 10px">                        'One',

</span><span class="cx" style="display: block; padding: 0 10px">                        'category'

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3052,7 +3054,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">-                // Ensure child terms are not empty

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Ensure child terms are not empty.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $first_post_id  = self::factory()->post->create();

</span><span class="cx" style="display: block; padding: 0 10px">                $second_post_id = self::factory()->post->create();

</span><span class="cx" style="display: block; padding: 0 10px">                wp_set_post_terms( $first_post_id, array( $three_term['term_id'] ), 'category' );

</span></span></pre></div>

<a id="trunktestsphpunitteststermqueryphp"></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/query.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/query.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/term/query.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -481,7 +481,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                wp_set_object_terms( $post_id, array( $term_ids[0], $term_ids[1] ), 'wptests_tax' );

</span><span class="cx" style="display: block; padding: 0 10px">                $terms = get_the_terms( $post_id, 'wptests_tax' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array( $term_ids[0], $term_ids[1] ), wp_list_pluck( $terms, 'term_id' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Flip the order

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Flip the order.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_set_object_terms( $post_id, array( $term_ids[1], $term_ids[0] ), 'wptests_tax' );

</span><span class="cx" style="display: block; padding: 0 10px">                $terms = get_the_terms( $post_id, 'wptests_tax' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array( $term_ids[1], $term_ids[0] ), wp_list_pluck( $terms, 'term_id' ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -511,7 +511,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                wp_set_object_terms( $post_id, array( $term_ids[0], $term_ids[1] ), 'wptests_tax' );

</span><span class="cx" style="display: block; padding: 0 10px">                $terms = wp_get_object_terms( $post_id, array( 'category', 'wptests_tax' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array( $term_ids[0], $term_ids[1], 1 ), wp_list_pluck( $terms, 'term_id' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Flip the order

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Flip the order.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_set_object_terms( $post_id, array( $term_ids[1], $term_ids[0] ), 'wptests_tax' );

</span><span class="cx" style="display: block; padding: 0 10px">                $terms = wp_get_object_terms( $post_id, array( 'category', 'wptests_tax' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array( $term_ids[1], $term_ids[0], 1 ), wp_list_pluck( $terms, 'term_id' ) );

</span></span></pre></div>

<a id="trunktestsphpunitteststermslashesphp"></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/slashes.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/slashes.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/term/slashes.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,7 +22,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Tests the model function that expects slashed data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Tests the model function that expects slashed data.

</ins><span class="cx" style="display: block; padding: 0 10px">          */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wp_insert_term() {

</span><span class="cx" style="display: block; padding: 0 10px">                $taxonomies = array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -69,7 +69,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Tests the model function that expects slashed data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Tests the model function that expects slashed data.

</ins><span class="cx" style="display: block; padding: 0 10px">          */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wp_update_term() {

</span><span class="cx" style="display: block; padding: 0 10px">                $taxonomies = array(

</span></span></pre></div>

<a id="trunktestsphpunitteststermtaxQueryphp"></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/taxQuery.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/taxQuery.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/term/taxQuery.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -256,7 +256,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                array(

</span><span class="cx" style="display: block; padding: 0 10px">                                        'taxonomy' => 'category',

</span><span class="cx" style="display: block; padding: 0 10px">                                        'terms'    => array( $t1 ),

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        'field'    => 'foo', // Anything defaults to term_id

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 'field'    => 'foo', // Anything defaults to 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="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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/term/termExists.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -259,7 +259,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_term_exists_known() {

</span><span class="cx" style="display: block; padding: 0 10px">                register_taxonomy( 'wptests_tax', '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">-                // insert a term

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Insert a term.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $term = rand_str();

</span><span class="cx" style="display: block; padding: 0 10px">                $t    = wp_insert_term( $term, 'wptests_tax' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'array', $t );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -266,7 +266,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $t['term_id'], term_exists( $t['term_id'] ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $t['term_id'], term_exists( $term ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // clean up

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Clean up.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( wp_delete_term( $t['term_id'], 'wptests_tax' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                _unregister_taxonomy( 'wptests_tax' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span></span></pre></div>

<a id="trunktestsphpunitteststermwpGenerateTagCloudphp"></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/wpGenerateTagCloud.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/wpGenerateTagCloud.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/term/wpGenerateTagCloud.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,23 +43,17 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function empty_tags_data_provider() {

</span><span class="cx" style="display: block; padding: 0 10px">                return array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        /**

-                        * when format => array, we should be getting an empty array back

-                        */

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // When 'format' => 'array', we should be getting an empty array back.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                array(),

</span><span class="cx" style="display: block; padding: 0 10px">                                array( 'format' => 'array' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        /**

-                        * List format returns an empty string

-                        */

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // List format returns an empty string.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                '',

</span><span class="cx" style="display: block; padding: 0 10px">                                array( 'format' => 'list' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        /**

-                        * $args can be an array or ''. Either should return an empty string

-                        */

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // $args can be an array or ''. Either should return an empty string.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                '',

</span><span class="cx" style="display: block; padding: 0 10px">                                array(),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -302,7 +296,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $tags = array();

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $terms as $term ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        //add the link

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Add the link.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $term->link = get_term_link( $term );

</span><span class="cx" style="display: block; padding: 0 10px">                        $tags[]     = $term;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunktestsphpunitteststermwpGetObjectTermsphp"></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/wpGetObjectTerms.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/wpGetObjectTerms.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/term/wpGetObjectTerms.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,11 +18,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $terms_1       = array( 'Foo', 'Bar', 'Baz' );

</span><span class="cx" style="display: block; padding: 0 10px">                $terms_1_slugs = array( 'foo', 'bar', 'baz' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // set the initial terms

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set the initial terms.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $tt_1 = wp_set_object_terms( $post_id, $terms_1, $this->taxonomy );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 3, count( $tt_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">-                // make sure they're correct

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure they're correct.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $terms = wp_get_object_terms(

</span><span class="cx" style="display: block; padding: 0 10px">                        $post_id,

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->taxonomy,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -897,7 +897,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        public function filter_get_object_terms( $terms ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $term_ids = wp_list_pluck( $terms, 'term_id' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // all terms should still be objects

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // All terms should still be objects.

</ins><span class="cx" style="display: block; padding: 0 10px">                 return $terms;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -941,14 +941,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $terms   = array( 'foo', 'bar', 'baz' );

</span><span class="cx" style="display: block; padding: 0 10px">                $set     = wp_set_object_terms( $post_id, $terms, $taxonomy );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Filter for maintaining term order

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Filter for maintaining term order.

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_filter( 'wp_get_object_terms_args', array( $this, 'filter_wp_get_object_terms_args' ), 10, 3 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test directly

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test directly.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $get_object_terms = wp_get_object_terms( $post_id, $taxonomy, array( 'fields' => 'names' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $terms, $get_object_terms );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test metabox taxonomy (admin advanced edit)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test metabox taxonomy (admin advanced edit).

</ins><span class="cx" style="display: block; padding: 0 10px">                 $terms_to_edit = get_terms_to_edit( $post_id, $taxonomy );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( implode( ',', $terms ), $terms_to_edit );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span></span></pre></div>

<a id="trunktestsphpunitteststermwpInsertTermphp"></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/wpInsertTerm.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/wpInsertTerm.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/term/wpInsertTerm.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,8 +8,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                parent::setUp();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                _clean_term_filters();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // insert one term into every post taxonomy

-               // otherwise term_ids and term_taxonomy_ids might be identical, which could mask bugs

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Insert one term into every post taxonomy.

+               // Otherwise term_ids and term_taxonomy_ids might be identical, which could mask bugs.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $term = 'seed_term';

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( get_object_taxonomies( 'post' ) as $tax ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        wp_insert_term( $term, $tax );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,7 +20,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $taxonomy = 'wptests_tax';

</span><span class="cx" style="display: block; padding: 0 10px">                register_taxonomy( $taxonomy, '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">-                // a new unused term

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // A new unused term.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $term = 'term';

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNull( term_exists( $term ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,11 +33,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $t['term_taxonomy_id'] > 0 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $initial_count + 1, wp_count_terms( $taxonomy ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // make sure the term exists

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure the term exists.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( term_exists( $term ) > 0 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( term_exists( $t['term_id'] ) > 0 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // now delete it

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Now delete it.

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_filter( 'delete_term', array( $this, 'deleted_term_cb' ), 10, 5 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( wp_delete_term( $t['term_id'], $taxonomy ) );

</span><span class="cx" style="display: block; padding: 0 10px">                remove_filter( 'delete_term', array( $this, 'deleted_term_cb' ), 10, 5 );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -189,7 +189,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotWPError( $term );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( empty( $term->errors ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test existing term name with unique slug

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test existing term name with unique slug.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $term1 = self::factory()->tag->create(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'name' => 'Bozo',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -198,12 +198,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotWPError( $term1 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test an existing term name

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test an existing term name.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $term2 = self::factory()->tag->create( array( 'name' => 'Bozo' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertWPError( $term2 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEmpty( $term2->errors );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test named terms ending in special characters

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test named terms ending in special characters.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $term3 = self::factory()->tag->create( array( 'name' => 'T$' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $term4 = self::factory()->tag->create( array( 'name' => 'T$$' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $term5 = self::factory()->tag->create( array( 'name' => 'T$$$' ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -216,7 +216,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $terms = array_map( 'get_tag', array( $term3, $term4, $term5, $term6 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertCount( 4, array_unique( wp_list_pluck( $terms, 'slug' ) ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test named terms with only special characters

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test named terms with only special characters.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $term8  = self::factory()->tag->create( array( 'name' => '$' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $term9  = self::factory()->tag->create( array( 'name' => '$$' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $term10 = self::factory()->tag->create( array( 'name' => '$$$' ) );

</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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/term/wpSetObjectTerms.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,7 +18,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $non_hier = rand_str( 10 );

</span><span class="cx" style="display: block; padding: 0 10px">                $hier     = rand_str( 10 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Register taxonomies

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Register taxonomies.

</ins><span class="cx" style="display: block; padding: 0 10px">                 register_taxonomy( $non_hier, array() );

</span><span class="cx" style="display: block; padding: 0 10px">                register_taxonomy( $hier, array( 'hierarchical' => true ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -112,17 +112,17 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $ids as $id ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $tt = wp_set_object_terms( $id, array_values( $term_id ), $this->taxonomy );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // should return three term taxonomy ids

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Should return three term taxonomy IDs.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertEquals( 3, count( $tt ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // each term should be associated with every post

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Each term should be associated with every post.

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $term_id as $term => $id ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $actual = get_objects_in_term( $id, $this->taxonomy );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $ids, array_map( 'intval', $actual ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // each term should have a count of 5

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Each term should have a count of 5.

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( array_keys( $term_id ) as $term ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $t = get_term_by( 'name', $term, $this->taxonomy );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( 5, $t->count );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -140,9 +140,9 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $ids as $id ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $tt = wp_set_object_terms( $id, $terms, $this->taxonomy );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // should return three term taxonomy ids

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Should return three term taxonomy IDs.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertEquals( 3, count( $tt ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // remember which term has which term_id

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Remember which term has which term_id.

</ins><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><span class="cx" style="display: block; padding: 0 10px">                                $term_id[ $terms[ $i ] ] = intval( $term->term_id );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -149,13 +149,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // each term should be associated with every post

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Each term should be associated with every post.

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $term_id as $term => $id ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $actual = get_objects_in_term( $id, $this->taxonomy );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $ids, array_map( 'intval', $actual ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // each term should have a count of 5

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Each term should have a count of 5.

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $terms as $term ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $t = get_term_by( 'name', $term, $this->taxonomy );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( 5, $t->count );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -163,7 +163,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_set_object_terms_invalid() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // bogus taxonomy

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Bogus taxonomy.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $result = wp_set_object_terms( self::$post_ids[0], array( rand_str() ), rand_str() );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertWPError( $result );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -243,12 +243,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                _unregister_taxonomy( 'wptests_tax' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        /**

+        * Set some terms on an object; then change them while leaving one intact.

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_change_object_terms_by_id() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // set some terms on an object; then change them while leaving one intact

-

</del><span class="cx" style="display: block; padding: 0 10px">                 $post_id = self::$post_ids[0];

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // first set: 3 terms

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // First set: 3 terms.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $terms_1 = array();

</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   = "term_{$i}";

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -257,7 +258,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $terms_1[ $i ] = $result['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">-                // second set: one of the original terms, plus one new term

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Second set: one of the original terms, plus one new term.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $terms_2    = array();

</span><span class="cx" style="display: block; padding: 0 10px">                $terms_2[0] = $terms_1[1];

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -265,11 +266,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $result     = wp_insert_term( $term, $this->taxonomy );

</span><span class="cx" style="display: block; padding: 0 10px">                $terms_2[1] = $result['term_id'];

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // set the initial terms

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set the initial terms.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $tt_1 = wp_set_object_terms( $post_id, $terms_1, $this->taxonomy );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 3, count( $tt_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">-                // make sure they're correct

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure they're correct.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $terms = wp_get_object_terms(

</span><span class="cx" style="display: block; padding: 0 10px">                        $post_id,

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->taxonomy,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -280,11 +281,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $terms_1, $terms );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // change the terms

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Change the terms.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $tt_2 = wp_set_object_terms( $post_id, $terms_2, $this->taxonomy );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 2, count( $tt_2 ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // make sure they're correct

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure they're correct.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $terms = wp_get_object_terms(

</span><span class="cx" style="display: block; padding: 0 10px">                        $post_id,

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->taxonomy,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -295,24 +296,25 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $terms_2, $terms );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // make sure the tt id for 'bar' matches

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure the term taxonomy ID for 'bar' matches.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $tt_1[1], $tt_2[0] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        /**

+        * Set some terms on an object; then change them while leaving one intact.

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_change_object_terms_by_name() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // set some terms on an object; then change them while leaving one intact

-

</del><span class="cx" style="display: block; padding: 0 10px">                 $post_id = self::$post_ids[0];

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $terms_1 = array( 'foo', 'bar', 'baz' );

</span><span class="cx" style="display: block; padding: 0 10px">                $terms_2 = array( 'bar', 'bing' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // set the initial terms

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set the initial terms.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $tt_1 = wp_set_object_terms( $post_id, $terms_1, $this->taxonomy );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 3, count( $tt_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">-                // make sure they're correct

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure they're correct.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $terms = wp_get_object_terms(

</span><span class="cx" style="display: block; padding: 0 10px">                        $post_id,

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->taxonomy,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -323,11 +325,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $terms_1, $terms );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // change the terms

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Change the terms.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $tt_2 = wp_set_object_terms( $post_id, $terms_2, $this->taxonomy );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 2, count( $tt_2 ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // make sure they're correct

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure they're correct.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $terms = wp_get_object_terms(

</span><span class="cx" style="display: block; padding: 0 10px">                        $post_id,

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->taxonomy,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -338,7 +340,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $terms_2, $terms );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // make sure the tt id for 'bar' matches

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure the term taxonomy ID for 'bar' matches.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $tt_1[1], $tt_2[0] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span></span></pre></div>

<a id="trunktestsphpunitteststermphp"></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.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/term.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,7 +50,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 5381

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_is_term_type() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // insert a term

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Insert a term.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $term = rand_str();

</span><span class="cx" style="display: block; padding: 0 10px">                $t    = wp_insert_term( $term, $this->taxonomy );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'array', $t );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,7 +57,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $term_obj = get_term_by( 'name', $term, $this->taxonomy );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $t['term_id'], term_exists( $term_obj->slug ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // clean up

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Clean up.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( wp_delete_term( $t['term_id'], $this->taxonomy ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</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 test_wp_count_terms() {

</span><span class="cx" style="display: block; padding: 0 10px">                $count = wp_count_terms( 'category', array( 'hide_empty' => true ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // there are 5 posts, all Uncategorized

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // There are 5 posts, all Uncategorized.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 1, $count );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -135,11 +135,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $t > 0 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $initial_count + 1, wp_count_terms( 'category' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // make sure the term exists

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure the term exists.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( term_exists( $term ) > 0 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( term_exists( $t ) > 0 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // now delete it

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Now delete it.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( wp_delete_category( $t ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNull( term_exists( $term ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNull( term_exists( $t ) );

</span></span></pre></div>

<a id="trunktestsphpunitteststhemeWPThemephp"></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/theme/WPTheme.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/theme/WPTheme.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/theme/WPTheme.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,7 +13,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'theme_root', array( $this, '_theme_root' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'stylesheet_root', array( $this, '_theme_root' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'template_root', array( $this, '_theme_root' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // clear caches

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Clear caches.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_clean_themes_cache();

</span><span class="cx" style="display: block; padding: 0 10px">                unset( $GLOBALS['wp_themes'] );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,7 +28,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                parent::tearDown();

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // replace the normal theme root dir with our premade test dir

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Replace the normal theme root directory with our premade test directory.

</ins><span class="cx" style="display: block; padding: 0 10px">         function _theme_root( $dir ) {

</span><span class="cx" style="display: block; padding: 0 10px">                return $this->theme_root;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</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">        function test_new_WP_Theme_top_level() {

</span><span class="cx" style="display: block; padding: 0 10px">                $theme = new WP_Theme( 'theme1', $this->theme_root );

</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

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Meta.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 'My Theme', $theme->get( 'Name' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'http://example.org/', $theme->get( 'ThemeURI' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'An example theme', $theme->get( 'Description' ) );

</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">                $this->assertEquals( 'publish', $theme->get( 'Status' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array(), $theme->get( 'Tags' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //Important

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Important.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 'theme1', $theme->get_stylesheet() );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'theme1', $theme->get_template() );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</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">        function test_new_WP_Theme_subdir() {

</span><span class="cx" style="display: block; padding: 0 10px">                $theme = new WP_Theme( 'subdir/theme2', $this->theme_root );

</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

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Meta.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 'My Subdir Theme', $theme->get( 'Name' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'http://example.org/', $theme->get( 'ThemeURI' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'An example theme in a sub directory', $theme->get( 'Description' ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,7 +65,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'publish', $theme->get( 'Status' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array(), $theme->get( 'Tags' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //Important

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Important.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 'subdir/theme2', $theme->get_stylesheet() );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'subdir/theme2', $theme->get_template() );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -74,10 +74,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 20313

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_new_WP_Theme_subdir_bad_root() {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // This is what get_theme_data() does when you pass it a style.css file for a theme in a subdir.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // This is what get_theme_data() does when you pass it a style.css file for a theme in a subdirectory.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $theme = new WP_Theme( 'theme2', $this->theme_root . '/subdir' );

</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

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Meta.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 'My Subdir Theme', $theme->get( 'Name' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'http://example.org/', $theme->get( 'ThemeURI' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'An example theme in a sub directory', $theme->get( 'Description' ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -88,7 +88,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'publish', $theme->get( 'Status' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array(), $theme->get( 'Tags' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //Important

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Important.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 'subdir/theme2', $theme->get_stylesheet() );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'subdir/theme2', $theme->get_template() );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -101,12 +101,12 @@

<span class="cx" style="display: block; padding: 0 10px">                // Make sure subdir/ is considered part of the stylesheet, as we must avoid encoding /'s.

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'subdir/theme with spaces', $theme->get_stylesheet() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check that in a URI path, we have raw url encoding (spaces become %20)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check that in a URI path, we have raw URL encoding (spaces become %20).

</ins><span class="cx" style="display: block; padding: 0 10px">                 // Don't try to verify the complete URI path. get_theme_root_uri() breaks down quickly.

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'theme%20with%20spaces', basename( $theme->get_stylesheet_directory_uri() ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'theme%20with%20spaces', basename( $theme->get_template_directory_uri() ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check that wp_customize_url() uses url encoding, as it is a query arg (spaces become +)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check that wp_customize_url() uses URL encoding, as it is a query arg (spaces become +).

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( admin_url( 'customize.php?theme=theme+with+spaces' ), wp_customize_url( 'theme with spaces' ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -162,7 +162,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $current_allowed_themes = get_site_option( 'allowedthemes' );

</span><span class="cx" style="display: block; padding: 0 10px">                WP_Theme::network_enable_theme( $theme );

</span><span class="cx" style="display: block; padding: 0 10px">                $new_allowed_themes = get_site_option( 'allowedthemes' );

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                update_site_option( 'allowedthemes', $current_allowed_themes ); // reset previous value.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         update_site_option( 'allowedthemes', $current_allowed_themes ); // Reset previous value.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $current_allowed_themes['testtheme-1'] = true; // Add the new theme to the previous set.

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEqualSetsWithIndex( $current_allowed_themes, $new_allowed_themes );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -179,7 +179,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $current_allowed_themes = get_site_option( 'allowedthemes' );

</span><span class="cx" style="display: block; padding: 0 10px">                WP_Theme::network_enable_theme( $themes );

</span><span class="cx" style="display: block; padding: 0 10px">                $new_allowed_themes = get_site_option( 'allowedthemes' );

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                update_site_option( 'allowedthemes', $current_allowed_themes ); // reset previous value.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         update_site_option( 'allowedthemes', $current_allowed_themes ); // Reset previous value.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $current_allowed_themes = array_merge(

</span><span class="cx" style="display: block; padding: 0 10px">                        $current_allowed_themes,

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -210,7 +210,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $disable_theme = 'existing-2';

</span><span class="cx" style="display: block; padding: 0 10px">                WP_Theme::network_disable_theme( $disable_theme );

</span><span class="cx" style="display: block; padding: 0 10px">                $new_allowed_themes = get_site_option( 'allowedthemes' );

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                update_site_option( 'allowedthemes', $current_allowed_themes ); // reset previous value.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         update_site_option( 'allowedthemes', $current_allowed_themes ); // Reset previous value.

</ins><span class="cx" style="display: block; padding: 0 10px">                 unset( $allowed_themes[ $disable_theme ] ); // Remove deleted theme from initial set.

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEqualSetsWithIndex( $allowed_themes, $new_allowed_themes );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -235,7 +235,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $disable_themes = array( 'existing-4', 'existing-5' );

</span><span class="cx" style="display: block; padding: 0 10px">                WP_Theme::network_disable_theme( $disable_themes );

</span><span class="cx" style="display: block; padding: 0 10px">                $new_allowed_themes = get_site_option( 'allowedthemes' );

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                update_site_option( 'allowedthemes', $current_allowed_themes ); // reset previous value.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         update_site_option( 'allowedthemes', $current_allowed_themes ); // Reset previous value.

</ins><span class="cx" style="display: block; padding: 0 10px">                 unset( $allowed_themes['existing-4'] );

</span><span class="cx" style="display: block; padding: 0 10px">                unset( $allowed_themes['existing-5'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunktestsphpunitteststhemesupportphp"></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/theme/support.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/theme/support.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/theme/support.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -78,7 +78,7 @@

<span class="cx" style="display: block; padding: 0 10px">                // array of arguments, with the key of 'types' holding the post types.

</span><span class="cx" style="display: block; padding: 0 10px">                add_theme_support( 'post-thumbnails', array( 'types' => true ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( current_theme_supports( 'post-thumbnails' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertTrue( current_theme_supports( 'post-thumbnails', rand_str() ) ); // any type

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertTrue( current_theme_supports( 'post-thumbnails', rand_str() ) ); // Any type.

</ins><span class="cx" style="display: block; padding: 0 10px">                 remove_theme_support( 'post-thumbnails' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( current_theme_supports( 'post-thumbnails' ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -167,7 +167,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 26900

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_supports_menus() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Start fresh

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Start fresh.

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( get_registered_nav_menus() as $location => $desc ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        unregister_nav_menu( $location );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span></span></pre></div>

<a id="trunktestsphpunitteststhemethemeDirphp"></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/theme/themeDir.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/theme/themeDir.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/theme/themeDir.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,7 +19,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'theme_root', array( $this, '_theme_root' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'stylesheet_root', array( $this, '_theme_root' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'template_root', array( $this, '_theme_root' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // clear caches

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Clear caches.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_clean_themes_cache();

</span><span class="cx" style="display: block; padding: 0 10px">                unset( $GLOBALS['wp_themes'] );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,7 +34,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                parent::tearDown();

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // replace the normal theme root dir with our premade test dir

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Replace the normal theme root directory with our premade test directory.

</ins><span class="cx" style="display: block; padding: 0 10px">         function _theme_root( $dir ) {

</span><span class="cx" style="display: block; padding: 0 10px">                return $this->theme_root;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,7 +50,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( empty( $theme ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                #echo gen_tests_array('theme', $theme);

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // echo gen_tests_array( 'theme', $theme );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'WordPress Default', $theme['Name'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'WordPress Default', $theme['Title'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -79,7 +79,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( empty( $theme ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                #echo gen_tests_array('theme', $theme);

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // echo gen_tests_array( 'theme', $theme );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'Sandbox', $theme['Name'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'Sandbox', $theme['Title'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -116,7 +116,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $theme = $themes['Stylesheet Only'];

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( empty( $theme ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                #echo gen_tests_array('theme', $theme);

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // echo gen_tests_array( 'theme', $theme );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'Stylesheet Only', $theme['Name'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'Stylesheet Only', $theme['Title'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -156,10 +156,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'Sandbox',

</span><span class="cx" style="display: block; padding: 0 10px">                        'Stylesheet Only',

</span><span class="cx" style="display: block; padding: 0 10px">                        'My Theme',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'My Theme/theme1', // duplicate theme should be given a unique name

-                       'My Subdir Theme', // theme in a subdirectory should work

-                       'Page Template Child Theme', // theme which inherits page templates

-                       'Page Template Theme', // theme with page templates for other test code

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'My Theme/theme1',                    // Duplicate theme should be given a unique name.

+                       'My Subdir Theme',                    // Theme in a subdirectory should work.

+                       'Page Template Child Theme',          // Theme which inherits page templates.

+                       'Page Template Theme',                // Theme with page templates for other test code.

</ins><span class="cx" style="display: block; padding: 0 10px">                         'Theme with Spaces in the Directory',

</span><span class="cx" style="display: block; padding: 0 10px">                        'Internationalized Theme',

</span><span class="cx" style="display: block; padding: 0 10px">                        'camelCase',

</span></span></pre></div>

<a id="trunktestsphpunitteststhemephp"></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/theme.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/theme.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/theme.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,7 +91,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertInstanceOf( 'WP_Theme', $theme );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertFalse( $theme->errors() );

</span><span class="cx" style="display: block; padding: 0 10px">                        $_theme = wp_get_theme( $theme->get_stylesheet() );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // This primes internal WP_Theme caches for the next assertion (headers_sanitized, textdomain_loaded)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // This primes internal WP_Theme caches for the next assertion (headers_sanitized, textdomain_loaded).

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertEquals( $theme->get( 'Name' ), $_theme->get( 'Name' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $theme, $_theme );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -102,7 +102,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_get_themes_contents() {

</span><span class="cx" style="display: block; padding: 0 10px">                $themes = get_themes();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Generic tests that should hold true for any theme

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Generic tests that should hold true for any theme.

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $themes as $k => $theme ) {

<span class="cx" style="display: block; padding: 0 10px">                        // Don't run these checks for custom themes.

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( empty( $theme['Author'] ) || false === strpos( $theme['Author'], 'WordPress' ) ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -112,7 +112,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $theme['Name'], $k );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertNotEmpty( $theme['Title'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // important attributes should all be set

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Important attributes should all be set.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $default_headers = array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'Title'          => 'Theme Title',

</span><span class="cx" style="display: block; padding: 0 10px">                                'Version'        => 'Version',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -125,7 +125,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'Description'    => 'Description',

</span><span class="cx" style="display: block; padding: 0 10px">                                'Author'         => 'Author',

</span><span class="cx" style="display: block; padding: 0 10px">                                'Tags'           => 'Tags',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Introduced in WordPress 2.9

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Introduced in WordPress 2.9.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'Theme Root'     => 'Theme Root',

</span><span class="cx" style="display: block; padding: 0 10px">                                'Theme Root URI' => 'Theme Root URI',

</span><span class="cx" style="display: block; padding: 0 10px">                        );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -133,10 +133,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->assertTrue( isset( $theme[ $name ] ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Make the tests work both for WordPress 2.8.5 and WordPress 2.9-rare

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Make the tests work both for WordPress 2.8.5 and WordPress 2.9-rare.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $dir = isset( $theme['Theme Root'] ) ? '' : WP_CONTENT_DIR;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // important attributes should all not be empty as well

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Important attributes should all not be empty as well.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertNotEmpty( $theme['Description'] );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertNotEmpty( $theme['Author'] );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertTrue( version_compare( $theme['Version'], 0 ) > 0 );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -143,7 +143,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertNotEmpty( $theme['Template'] );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertNotEmpty( $theme['Stylesheet'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // template files should all exist

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Template files should all exist.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertTrue( is_array( $theme['Template Files'] ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertTrue( count( $theme['Template Files'] ) > 0 );

</span><span class="cx" style="display: block; padding: 0 10px">                        foreach ( $theme['Template Files'] as $file ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -151,7 +151,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->assertTrue( is_readable( $dir . $file ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // css files should all exist

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // CSS files should all exist.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertTrue( is_array( $theme['Stylesheet Files'] ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertTrue( count( $theme['Stylesheet Files'] ) > 0 );

</span><span class="cx" style="display: block; padding: 0 10px">                        foreach ( $theme['Stylesheet Files'] as $file ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -270,7 +270,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</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">                        foreach ( $themes as $name => $theme ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // switch to this theme

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Switch to this theme.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( 2 === $i ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        switch_theme( $theme['Template'], $theme['Stylesheet'] );

</span><span class="cx" style="display: block; padding: 0 10px">                                } else {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -279,7 +279,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->assertEquals( $name, get_current_theme() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // make sure the various get_* functions return the correct values

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Make sure the various get_* functions return the correct values.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $this->assertEquals( $theme['Template'], get_template() );

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->assertEquals( $theme['Stylesheet'], get_stylesheet() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -292,24 +292,26 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->assertEquals( $root_fs . '/' . get_stylesheet(), get_stylesheet_directory() );

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->assertEquals( $root_uri . '/' . get_stylesheet(), get_stylesheet_directory_uri() );

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->assertEquals( $root_uri . '/' . get_stylesheet() . '/style.css', get_stylesheet_uri() );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                #               $this->assertEquals($root_uri . '/' . get_stylesheet(), get_locale_stylesheet_uri());

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // $this->assertEquals( $root_uri . '/' . get_stylesheet(), get_locale_stylesheet_uri() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->assertEquals( $root_fs . '/' . get_template(), get_template_directory() );

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->assertEquals( $root_uri . '/' . get_template(), get_template_directory_uri() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                //get_query_template

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // get_query_template()

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // template file that doesn't exist

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Template file that doesn't exist.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $this->assertEquals( '', get_query_template( rand_str() ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // template files that do exist

-                               //foreach ($theme['Template Files'] as $path) {

-                               //$file = basename($path, '.php');

-                               // FIXME: untestable because get_query_template uses TEMPLATEPATH

-                               //$this->assertEquals('', get_query_template($file));

-                               //}

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Template files that do exist.

+                               /*

+                               foreach ( $theme['Template Files'] as $path ) {

+                                       $file = basename($path, '.php');

+                                       FIXME: untestable because get_query_template() uses TEMPLATEPATH.

+                                       $this->assertEquals('', get_query_template($file));

+                               }

+                               */

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // these are kind of tautologies but at least exercise the code

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // These are kind of tautologies but at least exercise the code.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $this->assertEquals( get_404_template(), get_query_template( '404' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->assertEquals( get_archive_template(), get_query_template( 'archive' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->assertEquals( get_author_template(), get_query_template( 'author' ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -324,7 +326,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->assertEquals( get_tag_template(), get_query_template( 'tag' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // nb: this probably doesn't run because WP_INSTALLING is defined

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // nb: This probably doesn't run because WP_INSTALLING is defined.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $this->assertTrue( validate_current_theme() );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -331,7 +333,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">        function test_switch_theme_bogus() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // try switching to a theme that doesn't exist

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Try switching to a theme that doesn't exist.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $template = rand_str();

</span><span class="cx" style="display: block; padding: 0 10px">                $style    = rand_str();

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'template', $template );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -342,7 +344,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotFalse( $theme->errors() );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $theme->exists() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // these return the bogus name - perhaps not ideal behaviour?

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // These return the bogus name - perhaps not ideal behaviour?

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $template, get_template() );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $style, get_stylesheet() );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -370,7 +372,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_customize = new WP_Customize_Manager();

</span><span class="cx" style="display: block; padding: 0 10px">                do_action( 'customize_register', $wp_customize );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // The post_date for auto-drafts is bumped to match the changeset post_date whenever it is modified to keep them from from being garbage collected by wp_delete_auto_drafts().

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // The post_date for auto-drafts is bumped to match the changeset post_date whenever it is modified

+               // to keep them from from being garbage collected by wp_delete_auto_drafts().

</ins><span class="cx" style="display: block; padding: 0 10px">                 $wp_customize->save_changeset_post(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'data' => $data,

</span></span></pre></div>

<a id="trunktestsphpunittestsuploadphp"></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/upload.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/upload.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/upload.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,7 +13,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function _reset_options() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // system defaults

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // System defaults.

</ins><span class="cx" style="display: block; padding: 0 10px">                 update_option( 'upload_path', 'wp-content/uploads' );

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'upload_url_path', '' );

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'uploads_use_yearmonth_folders', 1 );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,7 +20,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_upload_dir_default() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // wp_upload_dir() with default parameters

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // wp_upload_dir() with default parameters.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $info   = wp_upload_dir();

</span><span class="cx" style="display: block; padding: 0 10px">                $subdir = gmstrftime( '/%Y/%m' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,7 +31,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_upload_dir_relative() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // wp_upload_dir() with a relative upload path that is not 'wp-content/uploads'

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // wp_upload_dir() with a relative upload path that is not 'wp-content/uploads'.

</ins><span class="cx" style="display: block; padding: 0 10px">                 update_option( 'upload_path', 'foo/bar' );

</span><span class="cx" style="display: block; padding: 0 10px">                $info   = _wp_upload_dir();

</span><span class="cx" style="display: block; padding: 0 10px">                $subdir = gmstrftime( '/%Y/%m' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,10 +48,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_upload_dir_absolute() {

</span><span class="cx" style="display: block; padding: 0 10px">                $path = '/tmp/wp-unit-test';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // wp_upload_dir() with an absolute upload path

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // wp_upload_dir() with an absolute upload path.

</ins><span class="cx" style="display: block; padding: 0 10px">                 update_option( 'upload_path', $path );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // doesn't make sense to use an absolute file path without setting the url path

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Doesn't make sense to use an absolute file path without setting the url path.

</ins><span class="cx" style="display: block; padding: 0 10px">                 update_option( 'upload_url_path', '/baz' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Use `_wp_upload_dir()` directly to bypass caching and work with the changed options.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -92,7 +92,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">        function test_upload_dir_empty() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // upload path setting is empty - it should default to 'wp-content/uploads'

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Upload path setting is empty - it should default to 'wp-content/uploads'.

</ins><span class="cx" style="display: block; padding: 0 10px">                 update_option( 'upload_path', '' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Use `_wp_upload_dir()` directly to bypass caching and work with the changed options.

</span></span></pre></div>

<a id="trunktestsphpunittestsurlphp"></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/url.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/url.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/url.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,7 +1,8 @@

</span><span class="cx" style="display: block; padding: 0 10px"> <?php

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// tests for link-template.php and related URL functions

</del><span class="cx" style="display: block; padding: 0 10px"> /**

<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Tests for link-template.php and related URL functions.

+ *

</ins><span class="cx" style="display: block; padding: 0 10px">  * @group url

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_URL extends WP_UnitTestCase {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -200,11 +201,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_home_url_from_admin() {

</span><span class="cx" style="display: block; padding: 0 10px">                $screen = get_current_screen();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Pretend to be in the site admin

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Pretend to be in the site admin.

</ins><span class="cx" style="display: block; padding: 0 10px">                 set_current_screen( 'dashboard' );

</span><span class="cx" style="display: block; padding: 0 10px">                $home = get_option( 'home' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // home_url() should return http when in the admin

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // home_url() should return http when in the admin.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_SERVER['HTTPS'] = 'on';

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $home, home_url() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -211,7 +212,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $_SERVER['HTTPS'] = 'off';

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $home, home_url() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If not in the admin, is_ssl() should determine the scheme

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If not in the admin, is_ssl() should determine the scheme.

</ins><span class="cx" style="display: block; padding: 0 10px">                 set_current_screen( 'front' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $home, home_url() );

</span><span class="cx" style="display: block; padding: 0 10px">                $_SERVER['HTTPS'] = 'on';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -218,14 +219,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $home             = str_replace( 'http://', 'https://', $home );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $home, home_url() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test with https in home

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test with https in home.

</ins><span class="cx" style="display: block; padding: 0 10px">                 update_option( 'home', set_url_scheme( $home, 'https' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Pretend to be in the site admin

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Pretend to be in the site admin.

</ins><span class="cx" style="display: block; padding: 0 10px">                 set_current_screen( 'dashboard' );

</span><span class="cx" style="display: block; padding: 0 10px">                $home = get_option( 'home' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // home_url() should return whatever scheme is set in the home option when in the admin

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // home_url() should return whatever scheme is set in the home option when in the admin.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_SERVER['HTTPS'] = 'on';

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $home, home_url() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -232,7 +233,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $_SERVER['HTTPS'] = 'off';

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $home, home_url() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If not in the admin, is_ssl() should determine the scheme unless https hard-coded in home

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If not in the admin, is_ssl() should determine the scheme unless https hard-coded in home.

</ins><span class="cx" style="display: block; padding: 0 10px">                 set_current_screen( 'front' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $home, home_url() );

</span><span class="cx" style="display: block; padding: 0 10px">                $_SERVER['HTTPS'] = 'on';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -248,11 +249,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_network_home_url_from_admin() {

</span><span class="cx" style="display: block; padding: 0 10px">                $screen = get_current_screen();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Pretend to be in the site admin

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Pretend to be in the site admin.

</ins><span class="cx" style="display: block; padding: 0 10px">                 set_current_screen( 'dashboard' );

</span><span class="cx" style="display: block; padding: 0 10px">                $home = network_home_url();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // home_url() should return http when in the admin

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // home_url() should return http when in the admin.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 0, strpos( $home, 'http://' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $_SERVER['HTTPS'] = 'on';

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $home, network_home_url() );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -260,7 +261,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $_SERVER['HTTPS'] = 'off';

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $home, network_home_url() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If not in the admin, is_ssl() should determine the scheme

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If not in the admin, is_ssl() should determine the scheme.

</ins><span class="cx" style="display: block; padding: 0 10px">                 set_current_screen( 'front' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $home, network_home_url() );

</span><span class="cx" style="display: block; padding: 0 10px">                $_SERVER['HTTPS'] = 'on';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -349,12 +350,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'WP_Post', $p );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $post_id, $p->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">-                // The same again to make sure a cached query returns the same result

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // The same again to make sure a cached query returns the same result.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $p = get_adjacent_post();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'WP_Post', $p );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $post_id, $p->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">-                // Test next

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test next.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $p = get_adjacent_post( false, '', false );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( '', $p );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunktestsphpunittestsuserauthorphp"></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/author.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/author.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/user/author.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -61,7 +61,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                add_user_meta( self::$author_id, 'user_description', 'user description' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'user description', get_user_meta( self::$author_id, 'user_description', true ) );

<span class="cx" style="display: block; padding: 0 10px">                // user_description in meta is ignored. The content of description is returned instead.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // See #20285

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // See #20285.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 'test_author', get_the_author_meta( 'user_description' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'test_author', trim( get_the_author_meta( 'description' ) ) );

</span><span class="cx" style="display: block; padding: 0 10px">                update_user_meta( self::$author_id, 'user_description', '' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,7 +80,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_get_the_author_posts() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test with no global post, result should be 0 because no author is found

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test with no global post, result should be 0 because no author is found.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 0, get_the_author_posts() );

</span><span class="cx" style="display: block; padding: 0 10px">                $GLOBALS['post'] = self::$post_id;

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 1, get_the_author_posts() );

</span></span></pre></div>

<a id="trunktestsphpunittestsusercapabilitiesphp"></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/capabilities.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/capabilities.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/user/capabilities.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,8 +1,8 @@

</span><span class="cx" style="display: block; padding: 0 10px"> <?php

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Test roles and capabilities via the WP_User class

-

</del><span class="cx" style="display: block; padding: 0 10px"> /**

<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Test roles and capabilities via the WP_User class.

+ *

</ins><span class="cx" style="display: block; padding: 0 10px">  * @group user

</span><span class="cx" style="display: block; padding: 0 10px">  * @group capabilities

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,7 +43,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function setUp() {

</span><span class="cx" style="display: block; padding: 0 10px">                parent::setUp();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // keep track of users we create

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Keep track of users we create.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->_flush_roles();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,8 +54,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">        function _flush_roles() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // we want to make sure we're testing against the db, not just in-memory data

-               // this will flush everything and reload it from the db

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // We want to make sure we're testing against the DB, not just in-memory data.

+               // This will flush everything and reload it from the DB.

</ins><span class="cx" style="display: block; padding: 0 10px">                 unset( $GLOBALS['wp_user_roles'] );

</span><span class="cx" style="display: block; padding: 0 10px">                global $wp_roles;

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_roles = new WP_Roles();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -334,7 +334,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // test the tests

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**

+        * Test the tests.

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_single_and_multisite_cap_tests_match() {

</span><span class="cx" style="display: block; padding: 0 10px">                $single_primitive = array_keys( $this->_getSingleSitePrimitiveCaps() );

</span><span class="cx" style="display: block; padding: 0 10px">                $multi_primitive  = array_keys( $this->_getMultiSitePrimitiveCaps() );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -349,26 +351,28 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $single_meta, $multi_meta );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // test the tests

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**

+        * Test the tests.

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_all_caps_of_users_are_being_tested() {

</span><span class="cx" style="display: block; padding: 0 10px">                $caps = $this->getPrimitiveCapsAndRoles();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // `manage_links` is a special case

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // `manage_links` is a special case.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertSame( '0', get_option( 'link_manager_enabled' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // `unfiltered_upload` is a special case

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // `unfiltered_upload` is a special case.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( defined( 'ALLOW_UNFILTERED_UPLOADS' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( self::$users as $role => $user ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // make sure the user is valid

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Make sure the user is valid.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertTrue( $user->exists(), "User with {$role} role does not exist" );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $user_caps = $user->allcaps;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        unset(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // `manage_links` is a special case

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // `manage_links` is a special case.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $user_caps['manage_links'],

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // `unfiltered_upload` is a special case

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // `unfiltered_upload` is a special case.

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $user_caps['unfiltered_upload']

</span><span class="cx" style="display: block; padding: 0 10px">                        );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -406,9 +410,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                unset(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // `manage_links` is a special case in the caps tests:

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // `manage_links` is a special case in the caps tests.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $expected['manage_links'],

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // `unfiltered_upload` is a special case in the caps tests:

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // `unfiltered_upload` is a special case in the caps tests.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $expected['unfiltered_upload']

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -505,16 +509,18 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( array(), $incorrect_meta_cap_checks, 'These capabilities are not meta' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // test the default roles and caps

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**

+        * Test the default roles and caps.

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_all_roles_and_caps() {

</span><span class="cx" style="display: block; padding: 0 10px">                $caps = $this->getAllCapsAndRoles();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( self::$users as $role => $user ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // make sure the user is valid

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Make sure the user is valid.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertTrue( $user->exists(), "User with {$role} role does not exist" );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // make sure the role name is correct

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Make sure the role name is correct.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertEquals( array( $role ), $user->roles, "User should only have the {$role} role" );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        foreach ( $caps as $cap => $roles ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -589,7 +595,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                return $allcaps;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // special case for the link manager

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**

+        * Special case for the link manager.

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_link_manager_caps() {

</span><span class="cx" style="display: block; padding: 0 10px">                $caps = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'manage_links' => array( 'administrator', 'editor' ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -597,7 +605,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( '0', get_option( 'link_manager_enabled' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // no-one should have access to the link manager by default

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // No-one should have access to the link manager by default.

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( self::$users as $role => $user ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        foreach ( $caps as $cap => $roles ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->assertFalse( $user->has_cap( $cap ), "User with the {$role} role should not have the {$cap} capability" );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -625,11 +633,13 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // special case for unfiltered uploads

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**

+        * Special case for unfiltered uploads.

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_unfiltered_upload_caps() {

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( defined( 'ALLOW_UNFILTERED_UPLOADS' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // no-one should have this cap

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // No-one should have this cap.

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( self::$users as $role => $user ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertFalse( $user->has_cap( 'unfiltered_upload' ), "User with the {$role} role should not have the unfiltered_upload capability" );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertFalse( user_can( $user, 'unfiltered_upload' ), "User with the {$role} role should not have the unfiltered_upload capability" );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -741,14 +751,16 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( user_can( $user, 'unfiltered_upload' ), 'Super Admins should not have the unfiltered_upload capability' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // a role that doesn't exist

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**

+        * A role that doesn't exist.

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_bogus_role() {

</span><span class="cx" style="display: block; padding: 0 10px">                $user = self::factory()->user->create_and_get( array( 'role' => 'invalid_role' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // make sure the user is valid

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure the user is valid.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( $user->exists(), 'User does not exist' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // make sure the role name is correct

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure the role name is correct.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( array(), $user->roles, 'User should not have any roles' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $caps = $this->getAllCapsAndRoles();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -759,16 +771,18 @@

</span><span class="cx" style="display: 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">-        // a user with multiple roles

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**

+        * A user with multiple roles.

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_user_subscriber_contributor() {

</span><span class="cx" style="display: block; padding: 0 10px">                $user = self::$users['subscriber'];

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // make sure the user is valid

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure the user is valid.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( $user->exists(), 'User does not exist' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $user->add_role( 'contributor' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // user should have two roles now

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // User should have two roles now.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( array( 'subscriber', 'contributor' ), $user->roles );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $caps = $this->getAllCapsAndRoles();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -784,12 +798,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $user->remove_role( 'contributor' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // user should have one role now

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // User should have one role now.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( array( 'subscriber' ), $user->roles );

</span><span class="cx" style="display: 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">-        // newly added empty role

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**

+        * Newly added empty role.

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_add_empty_role() {

</span><span class="cx" style="display: block; padding: 0 10px">                global $wp_roles;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -801,10 +817,10 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $user = self::factory()->user->create_and_get( array( 'role' => $role_name ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // make sure the user is valid

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure the user is valid.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( $user->exists(), 'User does not exist' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // make sure the role name is correct

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure the role name is correct.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( array( $role_name ), $user->roles );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $caps = $this->getAllCapsAndRoles();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -814,13 +830,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertFalse( user_can( $user, $cap ), "User should not have the {$cap} capability" );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // clean up

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Clean up.

</ins><span class="cx" style="display: block; padding: 0 10px">                 remove_role( $role_name );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->_flush_roles();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $wp_roles->is_role( $role_name ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // newly added role

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**

+        * Newly added role.

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_add_role() {

</span><span class="cx" style="display: block; padding: 0 10px">                global $wp_roles;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -838,16 +856,16 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $user = self::factory()->user->create_and_get( array( 'role' => $role_name ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // make sure the user is valid

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure the user is valid.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( $user->exists(), 'User does not exist' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // make sure the role name is correct

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure the role name is correct.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( array( $role_name ), $user->roles );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $caps = $this->getPrimitiveCapsAndRoles();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $caps as $cap => $roles ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // the user should have all the above caps

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // The user should have all the above caps.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( isset( $expected_caps[ $cap ] ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->assertTrue( $user->has_cap( $cap ), "User should have the {$cap} capability" );

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->assertTrue( user_can( $user, $cap ), "User should have the {$cap} capability" );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -857,15 +875,17 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // clean up

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Clean up.

</ins><span class="cx" style="display: block; padding: 0 10px">                 remove_role( $role_name );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->_flush_roles();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $wp_roles->is_role( $role_name ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        /**

+        * Change the capabilites associated with a role and make sure the change

+        * is reflected in has_cap().

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_role_add_cap() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // change the capabilites associated with a role and make sure the change is reflected in has_cap()

-

</del><span class="cx" style="display: block; padding: 0 10px">                 global $wp_roles;

</span><span class="cx" style="display: block; padding: 0 10px">                $role_name = 'janitor';

</span><span class="cx" style="display: block; padding: 0 10px">                add_role( $role_name, 'Janitor', array( 'level_1' => true ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -872,10 +892,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->_flush_roles();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $wp_roles->is_role( $role_name ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // assign a user to that role

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Assign a user to that role.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $id = self::factory()->user->create( array( 'role' => $role_name ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // now add a cap to the role

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Now add a cap to the role.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $wp_roles->add_cap( $role_name, 'sweep_floor' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->_flush_roles();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -883,12 +903,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $user->exists(), "Problem getting user $id" );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array( $role_name ), $user->roles );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // the user should have all the above caps

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // The user should have all the above caps.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( $user->has_cap( $role_name ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $user->has_cap( 'level_1' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $user->has_cap( 'sweep_floor' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // shouldn't have any other caps

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Shouldn't have any other caps.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $caps = $this->getAllCapsAndRoles();

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $caps as $cap => $roles ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( 'level_1' !== $cap ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -896,7 +916,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">-                // clean up

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Clean up.

</ins><span class="cx" style="display: block; padding: 0 10px">                 remove_role( $role_name );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->_flush_roles();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $wp_roles->is_role( $role_name ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -903,9 +923,11 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        /**

+        * Change the capabilites associated with a role and make sure the change

+        * is reflected in has_cap().

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_role_remove_cap() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // change the capabilites associated with a role and make sure the change is reflected in has_cap()

-

</del><span class="cx" style="display: block; padding: 0 10px">                 global $wp_roles;

</span><span class="cx" style="display: block; padding: 0 10px">                $role_name = 'janitor';

</span><span class="cx" style="display: block; padding: 0 10px">                add_role(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -920,10 +942,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->_flush_roles();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $wp_roles->is_role( $role_name ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // assign a user to that role

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Assign a user to that role.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $id = self::factory()->user->create( array( 'role' => $role_name ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // now remove a cap from the role

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Now remove a cap from the role.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $wp_roles->remove_cap( $role_name, 'polish_doorknobs' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->_flush_roles();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -931,15 +953,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $user->exists(), "Problem getting user $id" );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array( $role_name ), $user->roles );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // the user should have all the above caps

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // The user should have all the above caps.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( $user->has_cap( $role_name ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $user->has_cap( 'level_1' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $user->has_cap( 'sweep_floor' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // shouldn't have the removed cap

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Shouldn't have the removed cap.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( $user->has_cap( 'polish_doorknobs' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // clean up

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Clean up.

</ins><span class="cx" style="display: block; padding: 0 10px">                 remove_role( $role_name );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->_flush_roles();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $wp_roles->is_role( $role_name ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -946,33 +968,34 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        /**

+        * Add an extra capability to a user.

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_user_add_cap() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // add an extra capability to a user

-

-               // there are two contributors

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // There are two contributors.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $id_1 = self::factory()->user->create( array( 'role' => 'contributor' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $id_2 = self::factory()->user->create( array( 'role' => 'contributor' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // user 1 has an extra capability

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // User 1 has an extra capability.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $user_1 = new WP_User( $id_1 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $user_1->exists(), "Problem getting user $id_1" );

</span><span class="cx" style="display: block; padding: 0 10px">                $user_1->add_cap( 'publish_posts' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // re-fetch both users from the db

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Re-fetch both users from the DB.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $user_1 = new WP_User( $id_1 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $user_1->exists(), "Problem getting user $id_1" );

</span><span class="cx" style="display: block; padding: 0 10px">                $user_2 = new WP_User( $id_2 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $user_2->exists(), "Problem getting user $id_2" );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // make sure they're both still contributors

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure they're both still contributors.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( array( 'contributor' ), $user_1->roles );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array( 'contributor' ), $user_2->roles );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // check the extra cap on both users

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check the extra cap on both users.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( $user_1->has_cap( 'publish_posts' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $user_2->has_cap( 'publish_posts' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // make sure the other caps didn't get messed up

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure the other caps didn't get messed up.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $caps = $this->getAllCapsAndRoles();

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $caps as $cap => $roles ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( in_array( 'contributor', $roles, true ) || 'publish_posts' === $cap ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -984,57 +1007,59 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        /**

+        * Add an extra capability to a user then remove it.

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_user_remove_cap() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // add an extra capability to a user then remove it

-

-               // there are two contributors

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // There are two contributors.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $id_1 = self::factory()->user->create( array( 'role' => 'contributor' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $id_2 = self::factory()->user->create( array( 'role' => 'contributor' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // user 1 has an extra capability

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // User 1 has an extra capability.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $user_1 = new WP_User( $id_1 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $user_1->exists(), "Problem getting user $id_1" );

</span><span class="cx" style="display: block; padding: 0 10px">                $user_1->add_cap( 'publish_posts' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // now remove the extra cap

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Now remove the extra cap.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $user_1->remove_cap( 'publish_posts' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // re-fetch both users from the db

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Re-fetch both users from the DB.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $user_1 = new WP_User( $id_1 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $user_1->exists(), "Problem getting user $id_1" );

</span><span class="cx" style="display: block; padding: 0 10px">                $user_2 = new WP_User( $id_2 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $user_2->exists(), "Problem getting user $id_2" );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // make sure they're both still contributors

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure they're both still contributors.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( array( 'contributor' ), $user_1->roles );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array( 'contributor' ), $user_2->roles );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // check the removed cap on both users

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check the removed cap on both users.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( $user_1->has_cap( 'publish_posts' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $user_2->has_cap( 'publish_posts' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        /**

+        * Make sure the user_level is correctly set and changed with the user's role.

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_user_level_update() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // make sure the user_level is correctly set and changed with the user's role

-

-               // user starts as an author

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // User starts as an author.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $id   = self::factory()->user->create( array( 'role' => 'author' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $user = new WP_User( $id );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $user->exists(), "Problem getting user $id" );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // author = user level 2

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Author = user level 2.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 2, $user->user_level );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // they get promoted to editor - level should get bumped to 7

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // They get promoted to editor - level should get bumped to 7.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $user->set_role( 'editor' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 7, $user->user_level );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // demoted to contributor - level is reduced to 1

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Demoted to contributor - level is reduced to 1.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $user->set_role( 'contributor' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 1, $user->user_level );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // if they have two roles, user_level should be the max of the two

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If they have two roles, user_level should be the max of the two.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $user->add_role( 'editor' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array( 'contributor', 'editor' ), $user->roles );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 7, $user->user_level );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1041,16 +1066,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">        function test_user_remove_all_caps() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // user starts as an author

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // User starts as an author.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $id   = self::factory()->user->create( array( 'role' => 'author' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $user = new WP_User( $id );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $user->exists(), "Problem getting user $id" );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // add some extra capabilities

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Add some extra capabilities.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $user->add_cap( 'make_coffee' );

</span><span class="cx" style="display: block; padding: 0 10px">                $user->add_cap( 'drink_coffee' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // re-fetch

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Re-fetch.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $user = new WP_User( $id );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $user->exists(), "Problem getting user $id" );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1057,34 +1082,35 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $user->has_cap( 'make_coffee' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $user->has_cap( 'drink_coffee' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // all caps are removed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // All caps are removed.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $user->remove_all_caps();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // re-fetch

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Re-fetch.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $user = new WP_User( $id );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $user->exists(), "Problem getting user $id" );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // all capabilities for the user should be gone

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // All capabilities for the user should be gone.

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $this->getAllCapsAndRoles() as $cap => $roles ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertFalse( $user->has_cap( $cap ), "User should not have the {$cap} capability" );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // the extra capabilities should be gone

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // The extra capabilities should be gone.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( $user->has_cap( 'make_coffee' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $user->has_cap( 'drink_coffee' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // user level should be empty

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // User level should be empty.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEmpty( $user->user_level );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        /**

+        * Simple tests for some common meta capabilities.

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_post_meta_caps() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // simple tests for some common meta capabilities

-

-               // Get our author

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Get our author.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $author = self::$users['author'];

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // make a post

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make a post.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post = self::factory()->post->create(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_author' => $author->ID,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1092,37 +1118,37 @@

</span><span class="cx" style="display: 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">-                // the author of the post

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // The author of the post.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( $author->exists(), "Problem getting user $author->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">-                // add some other users

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Add some other users.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $admin       = new WP_User( self::factory()->user->create( array( 'role' => 'administrator' ) ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $author_2    = new WP_User( self::factory()->user->create( array( 'role' => 'author' ) ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $editor      = new WP_User( self::factory()->user->create( array( 'role' => 'editor' ) ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $contributor = new WP_User( self::factory()->user->create( array( 'role' => 'contributor' ) ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // administrators, editors and the post owner can edit it

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Administrators, editors and the post owner can edit it.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( $admin->has_cap( 'edit_post', $post ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $author->has_cap( 'edit_post', $post ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $editor->has_cap( 'edit_post', $post ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // other authors and contributors can't

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Other authors and contributors can't.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( $author_2->has_cap( 'edit_post', $post ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $contributor->has_cap( 'edit_post', $post ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // administrators, editors and the post owner can delete it

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Administrators, editors and the post owner can delete it.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( $admin->has_cap( 'delete_post', $post ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $author->has_cap( 'delete_post', $post ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $editor->has_cap( 'delete_post', $post ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // other authors and contributors can't

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Other authors and contributors can't.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( $author_2->has_cap( 'delete_post', $post ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $contributor->has_cap( 'delete_post', $post ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // administrators, editors, and authors can publish it

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Administrators, editors, and authors can publish it.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( $admin->has_cap( 'publish_post', $post ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $author->has_cap( 'publish_post', $post ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $editor->has_cap( 'publish_post', $post ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $author_2->has_cap( 'publish_post', $post ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // contributors can't

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Contributors can't.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( $contributor->has_cap( 'publish_post', $post ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                register_post_type( 'something', array( 'capabilities' => array( 'edit_posts' => 'draw_somethings' ) ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1145,7 +1171,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'create_somethings', $something->cap->create_posts );

</span><span class="cx" style="display: block; padding: 0 10px">                _unregister_post_type( 'something' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test meta authorization callbacks

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test meta authorization callbacks.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( function_exists( 'register_meta' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertTrue( $admin->has_cap( 'edit_post_meta', $post ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertTrue( $admin->has_cap( 'add_post_meta', $post ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1180,7 +1206,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @dataProvider authorless_post_statuses

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_authorless_post( $status ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make a post without an author

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make a post without an author.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post = self::factory()->post->create(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_author' => 0,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1189,17 +1215,17 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Add an editor and contributor

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Add an editor and contributor.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $editor      = self::$users['editor'];

</span><span class="cx" style="display: block; padding: 0 10px">                $contributor = self::$users['contributor'];

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // editor can publish, edit, view, and trash

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Editor can publish, edit, view, and trash.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( $editor->has_cap( 'publish_post', $post ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $editor->has_cap( 'edit_post', $post ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $editor->has_cap( 'delete_post', $post ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $editor->has_cap( 'read_post', $post ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // a contributor cannot (except read a published post)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // A contributor cannot (except read a published post).

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( $contributor->has_cap( 'publish_post', $post ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $contributor->has_cap( 'edit_post', $post ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $contributor->has_cap( 'delete_post', $post ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1216,7 +1242,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $contributor = self::$users['contributor'];

</span><span class="cx" style="display: block; padding: 0 10px">                $subscriber  = self::$users['subscriber'];

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // create_posts isn't a real cap.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // 'create_posts' isn't a real cap.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( $admin->has_cap( 'create_posts' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $author->has_cap( 'create_posts' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $editor->has_cap( 'create_posts' ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1236,7 +1262,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                _unregister_post_type( 'foobar' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Primitive capability edit_foobars is not assigned to any users.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Primitive capability 'edit_foobars' is not assigned to any users.

</ins><span class="cx" style="display: block; padding: 0 10px">                 register_post_type( 'foobar', array( 'capability_type' => array( 'foobar', 'foobars' ) ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $cap = get_post_type_object( 'foobar' )->cap;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1248,7 +1274,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $contributor->has_cap( $cap->create_posts ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $subscriber->has_cap( $cap->create_posts ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Add edit_foobars primitive cap to a user.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Add 'edit_foobars' primitive cap to a user.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $admin->add_cap( 'edit_foobars', true );

</span><span class="cx" style="display: block; padding: 0 10px">                $admin = new WP_User( $admin->ID );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $admin->has_cap( $cap->create_posts ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1272,13 +1298,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $subscriber->has_cap( $cap->create_posts ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        /**

+        * Simple tests for some common meta capabilities.

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_page_meta_caps() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // simple tests for some common meta capabilities

-

-               // Get our author

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Get our author.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $author = self::$users['author'];

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // make a page

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make a page.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $page = self::factory()->post->create(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_author' => $author->ID,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1286,27 +1313,27 @@

</span><span class="cx" style="display: 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">-                // the author of the page

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // The author of the page.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( $author->exists(), 'Problem getting user ' . $author->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">-                // add some other users

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Add some other users.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $admin       = self::$users['administrator'];

</span><span class="cx" style="display: block; padding: 0 10px">                $author_2    = new WP_User( self::factory()->user->create( array( 'role' => 'author' ) ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $editor      = self::$users['editor'];

</span><span class="cx" style="display: block; padding: 0 10px">                $contributor = self::$users['contributor'];

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // administrators, editors and the post owner can edit it

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Administrators, editors and the post owner can edit it.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( $admin->has_cap( 'edit_page', $page ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $editor->has_cap( 'edit_page', $page ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // other authors and contributors can't

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Other authors and contributors can't.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( $author->has_cap( 'edit_page', $page ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $author_2->has_cap( 'edit_page', $page ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $contributor->has_cap( 'edit_page', $page ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // administrators, editors and the post owner can delete it

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Administrators, editors and the post owner can delete it.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( $admin->has_cap( 'delete_page', $page ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $editor->has_cap( 'delete_page', $page ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // other authors and contributors can't

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Other authors and contributors can't.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( $author->has_cap( 'delete_page', $page ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $author_2->has_cap( 'delete_page', $page ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $contributor->has_cap( 'delete_page', $page ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1544,7 +1571,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">        function _nullify_current_user() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Prevents fatal errors in ::tearDown()'s and other uses of restore_current_blog()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Prevents fatal errors in ::tearDown()'s and other uses of restore_current_blog().

</ins><span class="cx" style="display: block; padding: 0 10px">                 $function_stack = wp_debug_backtrace_summary( null, 0, false );

</span><span class="cx" style="display: block; padding: 0 10px">                if ( in_array( 'restore_current_blog', $function_stack, true ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1661,10 +1688,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_contributor_cannot_edit_scheduled_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">-                // Add a contributor

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Add a contributor.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $contributor = self::$users['contributor'];

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Give them a scheduled post

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Give them a scheduled post.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post = $this->factory->post->create_and_get(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_author' => $contributor->ID,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1672,19 +1699,19 @@

</span><span class="cx" style="display: 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">-                // Ensure contributor can't edit or trash the post

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Ensure contributor can't edit or trash the post.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( user_can( $contributor->ID, 'edit_post', $post->ID ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( user_can( $contributor->ID, 'delete_post', $post->ID ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test the tests

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test the tests.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( defined( 'EMPTY_TRASH_DAYS' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEmpty( EMPTY_TRASH_DAYS );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Trash it

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Trash it.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $trashed = wp_trash_post( $post->ID );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEmpty( $trashed );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Ensure contributor can't edit, un-trash, or delete the post

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Ensure contributor can't edit, un-trash, or delete the post.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( user_can( $contributor->ID, 'edit_post', $post->ID ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( user_can( $contributor->ID, 'delete_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">@@ -1807,7 +1834,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertFalse( current_user_can( $cap ), "Non-logged-in user should not have the {$cap} capability" );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Special cases for link manager and unfiltered uploads:

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Special cases for link manager and unfiltered uploads.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( current_user_can( 'manage_links' ), 'Non-logged-in user should not have the manage_links capability' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( current_user_can( 'unfiltered_upload' ), 'Non-logged-in user should not have the unfiltered_upload capability' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunktestsphpunittestsusercountUsersphp"></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/countUsers.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/countUsers.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/user/countUsers.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,7 +12,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @group ms-excluded

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_count_users_is_accurate( $strategy ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Setup users

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Setup users.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $admin       = self::factory()->user->create(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'role' => 'administrator',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,7 +49,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test user counts

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test user counts.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $count = count_users( $strategy );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 8, $count['total_users'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,7 +76,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @dataProvider data_count_users_strategies

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_count_users_multisite_is_accurate( $strategy ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Setup users

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Setup users.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $admin       = self::factory()->user->create(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'role' => 'administrator',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -113,7 +113,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Setup blogs

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Setup blogs.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $blog_1 = (int) self::factory()->blog->create(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'user_id' => $editor,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -125,11 +125,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Add users to blogs

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Add users to blogs.

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_user_to_blog( $blog_1, $subscriber, 'editor' );

</span><span class="cx" style="display: block; padding: 0 10px">                add_user_to_blog( $blog_2, $none, 'contributor' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test users counts on root site

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test users counts on root site.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $count = count_users( $strategy );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 8, $count['total_users'] );

</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">                        $count['avail_roles']

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test users counts on blog 1

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test users counts on blog 1.

</ins><span class="cx" style="display: block; padding: 0 10px">                 switch_to_blog( $blog_1 );

</span><span class="cx" style="display: block; padding: 0 10px">                $count = count_users( $strategy );

</span><span class="cx" style="display: block; padding: 0 10px">                restore_current_blog();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -160,7 +160,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $count['avail_roles']

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test users counts on blog 2

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test users counts on blog 2.

</ins><span class="cx" style="display: block; padding: 0 10px">                 switch_to_blog( $blog_2 );

</span><span class="cx" style="display: block; padding: 0 10px">                $count = count_users( $strategy );

</span><span class="cx" style="display: block; padding: 0 10px">                restore_current_blog();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -213,7 +213,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_count_users_is_accurate_with_multiple_roles( $strategy ) {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Setup users

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Setup users.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $admin  = self::factory()->user->create(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'role' => 'administrator',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -235,7 +235,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        get_userdata( $editor )->roles

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test user counts

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test user counts.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $count = count_users( $strategy );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 3, $count['total_users'] );

</span></span></pre></div>

<a id="trunktestsphpunittestsusermultisitephp"></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/multisite.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/multisite.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/user/multisite.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -142,7 +142,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertSame( 0, $old_current );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // test for "get current user" when not logged in

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Test for "get current user" when not logged in.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertFalse( is_user_member_of_blog() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        wp_set_current_user( $user1_id );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -158,9 +158,9 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertInternalType( 'int', $blog_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">-                        // Current user gets added to new blogs

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Current user gets added to new blogs.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertTrue( is_user_member_of_blog( $user1_id, $blog_id ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Other users should not

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Other users should not.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertFalse( is_user_member_of_blog( $user2_id, $blog_id ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        switch_to_blog( $blog_id );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -168,10 +168,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertTrue( is_user_member_of_blog( $user1_id ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertFalse( is_user_member_of_blog( $user2_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">-                        // Remove user 1 from blog

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Remove user 1 from blog.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertTrue( remove_user_from_blog( $user1_id, $blog_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">-                        // Add user 2 to blog

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Add user 2 to blog.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertTrue( add_user_to_blog( $blog_id, $user2_id, 'subscriber' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertFalse( is_user_member_of_blog( $user1_id ) );

</span></span></pre></div>

<a id="trunktestsphpunittestsuserqueryphp"></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/query.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/query.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/user/query.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -554,12 +554,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEmpty( $query->query_vars );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEquals( $_query_vars, $query->query_vars );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // All values get reset

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // All values get reset.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $query->prepare_query( array( 'number' => 8 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEmpty( $query->query_limit );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'LIMIT 0, 8', $query->query_limit );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // All values get reset

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // All values get reset.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $query->prepare_query( array( 'fields' => 'all' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEmpty( $query->query_limit );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( '', $query->query_limit );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1139,7 +1139,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">                $found_count    = count( $q->get_results() );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $expected_count = 10; // 13 total users minus 3 from query

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $expected_count = 10; // 13 total users minus 3 from query.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertContains( "AND user_nicename NOT IN ( 'peter','paul','mary' )", $q->query_where );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected_count, $found_count );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1240,7 +1240,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $found_count    = count( $q->get_results() );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $expected_count = 10; // 13 total users minus 3 from query

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $expected_count = 10; // 13 total users minus 3 from query.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertContains( "AND user_login NOT IN ( '$user_login1','$user_login2','$user_login3' )", $q->query_where );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected_count, $found_count );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1443,23 +1443,23 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 22212

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_get_multiple_roles_with_meta() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Create administrator user + meta

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create administrator user + meta.

</ins><span class="cx" style="display: block; padding: 0 10px">                 update_user_meta( self::$admin_ids[0], 'mk1', 1 );

</span><span class="cx" style="display: block; padding: 0 10px">                update_user_meta( self::$admin_ids[0], 'mk2', 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">-                // Create editor user + meta

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create editor user + meta.

</ins><span class="cx" style="display: block; padding: 0 10px">                 update_user_meta( self::$editor_ids[0], 'mk1', 1 );

</span><span class="cx" style="display: block; padding: 0 10px">                update_user_meta( self::$editor_ids[0], 'mk2', 2 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Create subscriber user + meta

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create subscriber user + meta.

</ins><span class="cx" style="display: block; padding: 0 10px">                 update_user_meta( self::$sub_ids[0], 'mk1', 1 );

</span><span class="cx" style="display: block; padding: 0 10px">                update_user_meta( self::$sub_ids[0], 'mk2', 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">-                // Create contributor user + meta

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create contributor user + meta.

</ins><span class="cx" style="display: block; padding: 0 10px">                 update_user_meta( self::$contrib_id, 'mk1', 1 );

</span><span class="cx" style="display: block; padding: 0 10px">                update_user_meta( self::$contrib_id, 'mk2', 2 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Fetch users

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Fetch users.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $users = get_users(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'role__in'   => array( 'administrator', 'editor', 'subscriber' ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1481,7 +1481,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">-                // Check results

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check results.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 1, count( $users ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( self::$editor_ids[0], (int) $users[0]->ID );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span></span></pre></div>

<a id="trunktestsphpunittestsuserslashesphp"></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/slashes.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/slashes.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/user/slashes.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,8 +12,8 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                wp_set_current_user( $this->author_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">-                // it is important to test with both even and odd numbered slashes as

-               // kses does a strip-then-add slashes in some of its function calls

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // It is important to test with both even and odd numbered slashes,

+               // as KSES does a strip-then-add slashes in some of its function calls.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->slash_1 = 'String with 1 slash \\';

</span><span class="cx" style="display: block; padding: 0 10px">                $this->slash_2 = 'String with 2 slashes \\\\';

</span><span class="cx" style="display: block; padding: 0 10px">                $this->slash_3 = 'String with 3 slashes \\\\\\';

</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"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Tests the controller function that expects slashed data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Tests the controller function that expects slashed data.

</ins><span class="cx" style="display: block; padding: 0 10px">          */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_add_user() {

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST                 = array();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,8 +40,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['nickname']     = $this->slash_5;

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['display_name'] = $this->slash_7;

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['description']  = $this->slash_3;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $_POST                 = add_magic_quotes( $_POST ); // the edit_post() function will strip slashes

</del><span class="cx" style="display: block; padding: 0 10px"> 

<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                $_POST = add_magic_quotes( $_POST ); // The add_user() function will strip slashes.

+

</ins><span class="cx" style="display: block; padding: 0 10px">                 $id   = add_user();

</span><span class="cx" style="display: block; padding: 0 10px">                $user = get_user_to_edit( $id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -64,8 +65,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['nickname']     = $this->slash_6;

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['display_name'] = $this->slash_2;

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['description']  = $this->slash_4;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $_POST                 = add_magic_quotes( $_POST ); // the edit_post() function will strip slashes

</del><span class="cx" style="display: block; padding: 0 10px"> 

<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                $_POST = add_magic_quotes( $_POST ); // The add_user() function will strip slashes.

+

</ins><span class="cx" style="display: block; padding: 0 10px">                 $id   = add_user();

</span><span class="cx" style="display: block; padding: 0 10px">                $user = get_user_to_edit( $id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,7 +79,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">-         * Tests the controller function that expects slashed data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Tests the controller function that expects slashed data.

</ins><span class="cx" style="display: block; padding: 0 10px">          */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_edit_user() {

</span><span class="cx" style="display: block; padding: 0 10px">                $id = self::factory()->user->create();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -92,8 +94,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['nickname']     = $this->slash_5;

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['display_name'] = $this->slash_7;

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['description']  = $this->slash_3;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $_POST                 = add_magic_quotes( $_POST ); // the edit_post() function will strip slashes

</del><span class="cx" style="display: block; padding: 0 10px"> 

<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                $_POST = add_magic_quotes( $_POST ); // The edit_user() function will strip slashes.

+

</ins><span class="cx" style="display: block; padding: 0 10px">                 $id   = edit_user( $id );

</span><span class="cx" style="display: block; padding: 0 10px">                $user = get_user_to_edit( $id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -113,8 +116,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['nickname']     = $this->slash_6;

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['display_name'] = $this->slash_2;

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['description']  = $this->slash_4;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $_POST                 = add_magic_quotes( $_POST ); // the edit_post() function will strip slashes

</del><span class="cx" style="display: block; padding: 0 10px"> 

<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                $_POST = add_magic_quotes( $_POST ); // The edit_user() function will strip slashes.

+

</ins><span class="cx" style="display: block; padding: 0 10px">                 $id   = edit_user( $id );

</span><span class="cx" style="display: block; padding: 0 10px">                $user = get_user_to_edit( $id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -126,7 +130,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">-         * Tests the model function that expects slashed data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Tests the model function that expects slashed data.

</ins><span class="cx" style="display: block; padding: 0 10px">          */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wp_insert_user() {

</span><span class="cx" style="display: block; padding: 0 10px">                $id   = wp_insert_user(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -173,7 +177,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Tests the model function that expects slashed data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Tests the model function that expects slashed data.

</ins><span class="cx" style="display: block; padding: 0 10px">          */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wp_update_user() {

</span><span class="cx" style="display: block; padding: 0 10px">                $id   = self::factory()->user->create();

</span></span></pre></div>

<a id="trunktestsphpunittestsuserwpDeleteUserphp"></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/wpDeleteUser.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/wpDeleteUser.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/user/wpDeleteUser.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,7 +65,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'post_type'    => 'post',

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // insert a post and make sure the ID is ok

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Insert a post and make sure the ID is OK.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post_id = wp_insert_post( $post );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( is_numeric( $post_id ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $post_id > 0 );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,7 +81,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'post_type'    => 'nav_menu_item',

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // insert a post and make sure the ID is ok

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Insert a post and make sure the ID is OK.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $nav_id = wp_insert_post( $post );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( is_numeric( $nav_id ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $nav_id > 0 );

</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"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotNull( get_post( $post_id ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'trash', get_post( $post_id )->post_status );

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // nav_menu_item is delete_with_user = false so the nav post should remain published.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // 'nav_menu_item' is `delete_with_user = false` so the nav post should remain published.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertNotNull( get_post( $nav_id ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'publish', get_post( $nav_id )->post_status );

</span><span class="cx" style="display: block; padding: 0 10px">                wp_delete_post( $nav_id, true );

</span></span></pre></div>

<a id="trunktestsphpunittestsuserwpDropdownUsersphp"></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/wpDropdownUsers.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/wpDropdownUsers.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/user/wpDropdownUsers.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,7 +12,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_default_value_of_show_should_be_display_name() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // create a user with a different display_name

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create a user with a different display_name.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $u = $this->factory->user->create(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'user_login'   => 'foo',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,7 +36,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_show_should_display_display_name_show_is_specified_as_empty() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // create a user with a different display_name

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create a user with a different display_name.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $u = $this->factory->user->create(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'user_login'   => 'foo',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,7 +62,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_show_should_display_user_property_when_the_value_of_show_is_a_valid_user_property() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // create a user with a different display_name

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create a user with a different display_name.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $u = $this->factory->user->create(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'user_login'   => 'foo',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -88,7 +88,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_show_display_name_with_login() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // create a user with a different display_name

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create a user with a different display_name.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $u = $this->factory->user->create(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'user_login'   => 'foo',

</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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/user/wpGetUsersWithNoRole.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,7 +10,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @group ms-excluded

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_get_users_with_no_role_is_accurate() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Setup users

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Setup users.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $admin       = self::factory()->user->create(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'role' => 'administrator',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,7 +32,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test users

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test users.

</ins><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"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,7 +52,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @group ms-required

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_get_users_with_no_role_multisite_is_accurate() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Setup users

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Setup users.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $admin  = self::factory()->user->create(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'role' => 'administrator',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -69,7 +69,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Setup blogs

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Setup blogs.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $blog_1 = (int) self::factory()->blog->create(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'user_id' => $editor,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,10 +76,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Add editor to blog 1

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Add editor to blog 1.

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_user_to_blog( $blog_1, $editor, 'editor' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test users on root site

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test users on root site.

</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -88,14 +88,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $users

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test users counts on blog 1

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test users counts on blog 1.

</ins><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( array(), $users );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Add admin to blog 1 with no role

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Add admin to blog 1 with no role.

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_user_to_blog( $blog_1, $admin, '' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Re-test users counts on blog 1

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Re-test users counts on blog 1.

</ins><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></span></pre></div>

<a id="trunktestsphpunittestsuserphp"></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.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/user.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,7 +1,8 @@

</span><span class="cx" style="display: block; padding: 0 10px"> <?php

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// test functions in wp-includes/user.php

</del><span class="cx" style="display: block; padding: 0 10px"> /**

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Test functions in wp-includes/user.php

+ *

</ins><span class="cx" style="display: block; padding: 0 10px">  * @group user

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_User extends WP_UnitTestCase {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,7 +67,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">        function test_get_users_of_blog() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // add one of each user role

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Add one of each user role.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $nusers = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        self::$contrib_id,

</span><span class="cx" style="display: block; padding: 0 10px">                        self::$author_id,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,72 +78,76 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $user_list = get_users();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // find the role of each user as returned by get_users_of_blog

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Find the role of each user as returned by get_users_of_blog().

</ins><span class="cx" style="display: block; padding: 0 10px">                 $found = array();

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $user_list as $user ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // only include the users we just created - there might be some others that existed previously

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Only include the users we just created - there might be some others that existed previously.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( in_array( $user->ID, $nusers, true ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $found[] = $user->ID;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // make sure every user we created was returned

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure every user we created was returned.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEqualSets( $nusers, $found );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // simple get/set tests for user_option functions

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Simple get/set tests for user_option functions.

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_user_option() {

</span><span class="cx" style="display: block; padding: 0 10px">                $key = rand_str();

</span><span class="cx" style="display: block; padding: 0 10px">                $val = rand_str();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // get an option that doesn't exist

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Get an option that doesn't exist.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( get_user_option( $key, self::$author_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">-                // set and get

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set and get.

</ins><span class="cx" style="display: block; padding: 0 10px">                 update_user_option( self::$author_id, $key, $val );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $val, get_user_option( $key, self::$author_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">-                // change and get again

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Change and get again.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $val2 = rand_str();

</span><span class="cx" style="display: block; padding: 0 10px">                update_user_option( self::$author_id, $key, $val2 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $val2, get_user_option( $key, self::$author_id ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // simple tests for usermeta functions

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**

+        * Simple tests for usermeta functions.

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_usermeta() {

</span><span class="cx" style="display: block; padding: 0 10px">                $key = 'key';

</span><span class="cx" style="display: block; padding: 0 10px">                $val = 'value1';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // get a meta key that doesn't exist

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Get a meta key that doesn't exist.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( '', get_user_meta( self::$author_id, $key, 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">-                // set and get

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set and get.

</ins><span class="cx" style="display: block; padding: 0 10px">                 update_user_meta( self::$author_id, $key, $val );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $val, get_user_meta( self::$author_id, $key, 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">-                // change and get again

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Change and get again.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $val2 = 'value2';

</span><span class="cx" style="display: block; padding: 0 10px">                update_user_meta( self::$author_id, $key, $val2 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $val2, get_user_meta( self::$author_id, $key, 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">-                // delete and get

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Delete and get.

</ins><span class="cx" style="display: block; padding: 0 10px">                 delete_user_meta( self::$author_id, $key );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( '', get_user_meta( self::$author_id, $key, 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">-                // delete by key AND value

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Delete by key AND value.

</ins><span class="cx" style="display: block; padding: 0 10px">                 update_user_meta( self::$author_id, $key, $val );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // incorrect key: key still exists

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Incorrect key: key still exists.

</ins><span class="cx" style="display: block; padding: 0 10px">                 delete_user_meta( self::$author_id, $key, rand_str() );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $val, get_user_meta( self::$author_id, $key, true ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // correct key: deleted

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Correct key: deleted.

</ins><span class="cx" style="display: block; padding: 0 10px">                 delete_user_meta( self::$author_id, $key, $val );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( '', get_user_meta( self::$author_id, $key, true ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // test usermeta functions in array mode

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**

+        * Test usermeta functions in array mode.

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_usermeta_array() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // some values to set

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Some values to set.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $vals = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        rand_str() => 'val-' . rand_str(),

</span><span class="cx" style="display: block; padding: 0 10px">                        rand_str() => 'val-' . rand_str(),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -149,26 +154,26 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        rand_str() => 'val-' . rand_str(),

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // there is already some stuff in the array

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // There is already some stuff in the array.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( is_array( get_user_meta( self::$author_id ) ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $vals as $k => $v ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        update_user_meta( self::$author_id, $k, $v );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // get the complete usermeta array

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Get the complete usermeta array.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $out = get_user_meta( self::$author_id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // for reasons unclear, the resulting array is indexed numerically; meta keys are not included anywhere.

-               // so we'll just check to make sure our values are included somewhere.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // For reasons unclear, the resulting array is indexed numerically; meta keys are not included anywhere.

+               // So we'll just check to make sure our values are included somewhere.

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $vals as $k => $v ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertTrue( isset( $out[ $k ] ) && $out[ $k ][0] === $v );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // delete one key and check again

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Delete one key and check again.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $keys          = array_keys( $vals );

</span><span class="cx" style="display: block; padding: 0 10px">                $key_to_delete = array_pop( $keys );

</span><span class="cx" style="display: block; padding: 0 10px">                delete_user_meta( self::$author_id, $key_to_delete );

</span><span class="cx" style="display: block; padding: 0 10px">                $out = get_user_meta( self::$author_id );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // make sure that key is excluded from the results

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure that key is excluded from the results.

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $vals as $k => $v ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( $k === $key_to_delete ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->assertFalse( isset( $out[ $k ] ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -178,7 +183,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Test property magic functions for property get/set/isset.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**

+        * Test property magic functions for property get/set/isset.

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_user_properties() {

</span><span class="cx" style="display: block; padding: 0 10px">                $user = new WP_User( self::$author_id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -191,7 +198,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $user->$key = 'foo';

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'foo', $user->$key );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'foo', $user->data->$key );  // This will fail with WP < 3.3

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertEquals( 'foo', $user->data->$key );  // This will fail with WP < 3.3.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( get_object_vars( $user ) as $key => $value ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $value, $user->$key );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -199,7 +206,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">-         * Test the magic __unset method

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Test the magic __unset() method.

</ins><span class="cx" style="display: block; padding: 0 10px">          *

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 20043

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -207,7 +214,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                // phpcs:disable WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase

</span><span class="cx" style="display: block; padding: 0 10px">                $user = new WP_User( self::$author_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">-                // Test custom fields

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test custom fields.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $user->customField = 123;

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $user->customField, 123 );

</span><span class="cx" style="display: block; padding: 0 10px">                unset( $user->customField );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -217,12 +224,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * Test 'id' (lowercase).

+        *

</ins><span class="cx" style="display: block; padding: 0 10px">          * @depends test_user_unset

</span><span class="cx" style="display: block; padding: 0 10px">         * @expectedDeprecated WP_User->id

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 20043

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_user_unset_lowercase_id( $user ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test 'id' (lowercase)

</del><span class="cx" style="display: block; padding: 0 10px">                 $id = $user->id;

</span><span class="cx" style="display: block; padding: 0 10px">                unset( $user->id );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( $id, $user->id );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -230,17 +238,20 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * Test 'ID'.

+        *

</ins><span class="cx" style="display: block; padding: 0 10px">          * @depends test_user_unset_lowercase_id

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 20043

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_user_unset_uppercase_id( $user ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test 'ID'

</del><span class="cx" style="display: block; padding: 0 10px">                 $this->assertNotEmpty( $user->ID );

</span><span class="cx" style="display: block; padding: 0 10px">                unset( $user->ID );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEmpty( $user->ID );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Test meta property magic functions for property get/set/isset.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**

+        * Test meta property magic functions for property get/set/isset.

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_user_meta_properties() {

</span><span class="cx" style="display: block; padding: 0 10px">                $user = new WP_User( self::$author_id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -358,10 +369,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $user = new WP_User( self::$author_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'test user', $user->get( 'display_name' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make sure there is no collateral damage to fields not in $user_data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure there is no collateral damage to fields not in $user_data.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 'about me', $user->get( 'description' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Pass as stdClass

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Pass as stdClass.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $user_data = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'ID'           => self::$author_id,

</span><span class="cx" style="display: block; padding: 0 10px">                        'display_name' => 'a test user',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -376,7 +387,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'some test user', $user->get( 'display_name' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test update of fields in _get_additional_user_keys()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test update of fields in _get_additional_user_keys().

</ins><span class="cx" style="display: block; padding: 0 10px">                 $user_data = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'ID'                   => self::$author_id,

</span><span class="cx" style="display: block; padding: 0 10px">                        'use_ssl'              => 1,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -452,7 +463,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'post_type'    => 'post',

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // insert a post and make sure the ID is ok

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Insert a post and make sure the ID is OK.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post_id = wp_insert_post( $post );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( is_numeric( $post_id ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -477,6 +488,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( get_userdata( array( 'array' ) ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        /**

+        * @ticket 23480

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_user_get_data_by_id() {

</span><span class="cx" style="display: block; padding: 0 10px">                $user = WP_User::get_data_by( 'id', self::$author_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'stdClass', $user );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -569,7 +583,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $pwd_before = $user->user_pass;

</span><span class="cx" style="display: block; padding: 0 10px">                wp_update_user( $user );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Reload the data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Reload the data.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $pwd_after = get_userdata( $testuserid )->user_pass;

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $pwd_before, $pwd_after );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -746,7 +760,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        array( 'testuser' ),

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Multisite doesn't allow mixed case logins ever

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Multisite doesn't allow mixed case logins ever.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! is_multisite() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $data[] = array( 'TestUser' );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1287,7 +1301,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $existing_email = get_option( 'admin_email' );

</span><span class="cx" style="display: block; padding: 0 10px">                $new_email      = 'new-admin-email@test.dev';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Give the site a name containing HTML entities

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Give the site a name containing HTML entities.

</ins><span class="cx" style="display: block; padding: 0 10px">                 update_option( 'blogname', '&#039;Test&#039; blog&#039;s &quot;name&quot; has &lt;html entities&gt; &amp;' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                update_option_new_admin_email( $existing_email, $new_email );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1297,10 +1311,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $recipient = $mailer->get_recipient( 'to' );

</span><span class="cx" style="display: block; padding: 0 10px">                $email     = $mailer->get_sent();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Assert reciepient is correct

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Assert recipient is correct.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertSame( $new_email, $recipient->address, 'Admin email change notification recipient not as expected' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Assert that HTML entites have been decode in body and subject

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Assert that HTML entites have been decode in body and subject.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertContains( '\'Test\' blog\'s "name" has <html entities> &', $email->subject, 'Email subject does not contain the decoded HTML entities' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotContains( '&#039;Test&#039; blog&#039;s &quot;name&quot; has &lt;html entities&gt; &amp;', $email->subject, $email->subject, 'Email subject does contains HTML entities' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1573,7 +1587,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                reset_phpmailer_instance();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Give the site a name containing HTML entities

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Give the site a name containing HTML entities.

</ins><span class="cx" style="display: block; padding: 0 10px">                 update_option( 'blogname', '&#039;Test&#039; blog&#039;s &quot;name&quot; has &lt;html entities&gt; &amp;' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Set $_POST['email'] with new e-mail and $_POST['user_id'] with user's ID.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1587,10 +1601,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $recipient = $mailer->get_recipient( 'to' );

</span><span class="cx" style="display: block; padding: 0 10px">                $email     = $mailer->get_sent();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Assert recipient is correct

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Assert recipient is correct.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertSame( 'new-email@test.dev', $recipient->address, 'User email change confirmation recipient not as expected' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Assert that HTML entites have been decoded in body and subject

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Assert that HTML entites have been decoded in body and subject.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertContains( '\'Test\' blog\'s "name" has <html entities> &', $email->subject, 'Email subject does not contain the decoded HTML entities' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotContains( '&#039;Test&#039; blog&#039;s &quot;name&quot; has &lt;html entities&gt; &amp;', $email->subject, 'Email subject does contains HTML entities' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span></span></pre></div>

<a id="trunktestsphpunittestswalkerphp"></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/walker.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/walker.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/walker.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -214,13 +214,13 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 0, $this->walker->get_number_of_root_elements( $items ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // It's not clear what the output of this "should" be

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // It's not clear what the output of this "should" be.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Currently the item is simply returned

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Currently the item is simply returned.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( '<li>1</li>', $output );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // But as we've only asked for the first depth maybe nothing should be returned?

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //$this->assertEquals( '', $output );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // $this->assertEquals( '', $output );

</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">@@ -269,16 +269,16 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 0, $this->walker->get_number_of_root_elements( $items ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // It's not clear what the output of this "should" be

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // It's not clear what the output of this "should" be.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Currently the first item is simply returned

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Currently the first item is simply returned.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( '<li>4</li>', $output );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // But as we've only asked for the first depth maybe nothing should be returned?

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //$this->assertEquals( '', $output );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // $this->assertEquals( '', $output );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Or maybe all items which are missing parents should simply be treat top level?

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //$this->assertEquals( '<li>4</li><li>5</li><li>6</li>', $output );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // $this->assertEquals( '<li>4</li><li>5</li><li>6</li>', $output );

</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="trunktestsphpunittestswidgetstextwidgetphp"></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/widgets/text-widget.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/widgets/text-widget.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/widgets/text-widget.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -333,7 +333,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'filter' => false,

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Legacy Text Widget without wpautop.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Legacy Text Widget without wpautop().

</ins><span class="cx" style="display: block; padding: 0 10px">                 $instance                     = array_merge(

</span><span class="cx" style="display: block; padding: 0 10px">                        $base_instance,

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -350,7 +350,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotContains( '<p>' . $this->example_shortcode_content . '</p>', $output, 'Expected shortcode_unautop() to have run.' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNull( $this->post_during_shortcode );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Legacy Text Widget with wpautop.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Legacy Text Widget with wpautop().

</ins><span class="cx" style="display: block; padding: 0 10px">                 $instance                     = array_merge(

</span><span class="cx" style="display: block; padding: 0 10px">                        $base_instance,

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -388,7 +388,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Visual Text Widget with only core-added widget_text_content filter for do_shortcode.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Visual Text Widget with only core-added widget_text_content filter for do_shortcode().

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( has_filter( 'widget_text', 'do_shortcode' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 11, has_filter( 'widget_text_content', 'do_shortcode' ), 'Expected core to have set do_shortcode as widget_text_content filter.' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->shortcode_render_count = 0;

</span></span></pre></div>

<a id="trunktestsphpunittestswidgetsphp"></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/widgets.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/widgets.php     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/widgets.php       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -495,7 +495,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEmpty( $wp_registered_widgets );

</span><span class="cx" style="display: block; padding: 0 10px">                wp_widgets_init();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Note: We cannot use array_keys() here because $settings could be an ArrayIterator

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Note: We cannot use array_keys() here because $settings could be an ArrayIterator.

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $settings as $widget_number => $instance ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $widget_id = "search-$widget_number";

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertArrayHasKey( $widget_id, $wp_registered_widgets );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -502,7 +502,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // @todo test WP_Widget::display_callback()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // @todo Test WP_Widget::display_callback().

</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">         * @see WP_Widget::is_preview()

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -523,9 +523,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $widget->is_preview() );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // @todo test WP_Widget::update_callback()

-       // @todo test WP_Widget::form_callback()

-       // @todo test WP_Widget::_register_one()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // @todo Test WP_Widget::update_callback().

+       // @todo Test WP_Widget::form_callback().

+       // @todo Test WP_Widget::_register_one().

</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">         * @see WP_Widget::get_settings()

</span></span></pre></div>

<a id="trunktestsphpunittestsxmlrpcbasicphp"></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/basic.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/basic.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/xmlrpc/basic.php  2020-01-29 00:43:23 UTC (rev 47122)

</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">                $this->assertFalse( $this->myxmlrpcserver->login_pass_ok( 'username', 'password' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $this->myxmlrpcserver->login( 'username', 'password' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // The auth will still fail due to authentication blocking after the first failed attempt

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // The auth will still fail due to authentication blocking after the first failed attempt.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( $this->myxmlrpcserver->login_pass_ok( 'subscriber', 'subscriber' ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -45,7 +45,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $method_calls = array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Valid login

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Valid login.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'methodName' => 'wp.editPost',

</span><span class="cx" style="display: block; padding: 0 10px">                                'params'     => array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -58,7 +58,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">-                        // *Invalid* login

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // *Invalid* login.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'methodName' => 'wp.editPost',

</span><span class="cx" style="display: block; padding: 0 10px">                                'params'     => array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,7 +71,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                                ),

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Valid login

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Valid login.

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'methodName' => 'wp.editPost',

</span><span class="cx" style="display: block; padding: 0 10px">                                'params'     => array(

</span></span></pre></div>

<a id="trunktestsphpunittestsxmlrpcmweditPostphp"></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/mw/editPost.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/mw/editPost.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/xmlrpc/mw/editPost.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -145,32 +145,32 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( '', get_post_meta( $post_id, '_thumbnail_id', 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">-                // create attachment

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create attachment.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $filename      = ( DIR_TESTDATA . '/images/a2-small.jpg' );

</span><span class="cx" style="display: block; padding: 0 10px">                $attachment_id = self::factory()->attachment->create_upload_object( $filename, $post_id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // add post thumbnail to post that does not have one

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Add post thumbnail to post that does not have one.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post2  = array( 'wp_post_thumbnail' => $attachment_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $result = $this->myxmlrpcserver->mw_editPost( array( $post_id, 'author', 'author', $post2 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotIXRError( $result );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $attachment_id, get_post_meta( $post_id, '_thumbnail_id', 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">-                // edit the post without supplying a post_thumbnail and check that it didn't change

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Edit the post without supplying a post_thumbnail and check that it didn't change.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post3  = array( 'post_content' => 'Updated post' );

</span><span class="cx" style="display: block; padding: 0 10px">                $result = $this->myxmlrpcserver->mw_editPost( array( $post_id, 'author', 'author', $post3 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotIXRError( $result );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $attachment_id, get_post_meta( $post_id, '_thumbnail_id', 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">-                // create another attachment

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create another attachment.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $attachment2_id = self::factory()->attachment->create_upload_object( $filename, $post_id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // change the post's post_thumbnail

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Change the post's post_thumbnail.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post4  = array( 'wp_post_thumbnail' => $attachment2_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $result = $this->myxmlrpcserver->mw_editPost( array( $post_id, 'author', 'author', $post4 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotIXRError( $result );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $attachment2_id, get_post_meta( $post_id, '_thumbnail_id', 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">-                // unset the post's post_thumbnail

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Unset the post's post_thumbnail.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post5  = array( 'wp_post_thumbnail' => '' );

</span><span class="cx" style="display: block; padding: 0 10px">                $result = $this->myxmlrpcserver->mw_editPost( array( $post_id, 'author', 'author', $post5 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotIXRError( $result );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -246,7 +246,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $result );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Not allowed since [19914]

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Not allowed since [19914].

</ins><span class="cx" style="display: block; padding: 0 10px">         function test_change_post_type() {

</span><span class="cx" style="display: block; padding: 0 10px">                $contributor_id = $this->make_user_by_role( 'contributor' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunktestsphpunittestsxmlrpcmwgetPostphp"></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/mw/getPost.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/mw/getPost.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/xmlrpc/mw/getPost.php     2020-01-29 00:43:23 UTC (rev 47122)

</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">                $result = $this->myxmlrpcserver->mw_getPost( array( self::$post_id, 'author', 'author' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotIXRError( $result );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check data types

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check data types.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertInternalType( 'string', $result['userid'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'int', $result['postid'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'string', $result['description'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,7 +76,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $post_data = get_post( self::$post_id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check expected values

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check expected values.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertStringMatchesFormat( '%d', $result['userid'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $post_data->post_title, $result['title'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'publish', $result['post_status'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -92,7 +92,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_post_thumbnail() {

</span><span class="cx" style="display: block; padding: 0 10px">                add_theme_support( 'post-thumbnails' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // create attachment

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create attachment.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $filename      = ( DIR_TESTDATA . '/images/a2-small.jpg' );

</span><span class="cx" style="display: block; padding: 0 10px">                $attachment_id = self::factory()->attachment->create_upload_object( $filename );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunktestsphpunittestsxmlrpcmwgetRecentPostsphp"></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/mw/getRecentPosts.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/mw/getRecentPosts.php    2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/xmlrpc/mw/getRecentPosts.php      2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,7 +57,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $results as $result ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $post = get_post( $result['postid'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Check data types

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Check data types.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertInternalType( 'string', $result['userid'] );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertInternalType( 'string', $result['postid'] );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertInternalType( 'string', $result['description'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -79,7 +79,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertInternalType( 'array', $result['custom_fields'] );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertInternalType( 'string', $result['wp_post_format'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Check expected values

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Check expected values.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertStringMatchesFormat( '%d', $result['userid'] );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertStringMatchesFormat( '%d', $result['postid'] );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $post->post_title, $result['title'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -97,7 +97,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_post_thumbnail() {

</span><span class="cx" style="display: block; padding: 0 10px">                add_theme_support( 'post-thumbnails' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // create attachment

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create attachment.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $filename      = ( DIR_TESTDATA . '/images/a2-small.jpg' );

</span><span class="cx" style="display: block; padding: 0 10px">                $attachment_id = self::factory()->attachment->create_upload_object( $filename, self::$post_id );

</span><span class="cx" style="display: block; padding: 0 10px">                set_post_thumbnail( self::$post_id, $attachment_id );

</span></span></pre></div>

<a id="trunktestsphpunittestsxmlrpcmwnewPostphp"></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/mw/newPost.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/mw/newPost.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/xmlrpc/mw/newPost.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -133,7 +133,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->make_user_by_role( 'author' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // create attachment

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create attachment.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $filename      = ( DIR_TESTDATA . '/images/a2-small.jpg' );

</span><span class="cx" style="display: block; padding: 0 10px">                $attachment_id = self::factory()->attachment->create_upload_object( $filename );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunktestsphpunittestsxmlrpcwpeditPostphp"></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/editPost.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/editPost.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/xmlrpc/wp/editPost.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -145,17 +145,17 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( '', get_post_meta( $post_id, '_thumbnail_id', 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">-                // create attachment

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create attachment.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $filename      = ( DIR_TESTDATA . '/images/a2-small.jpg' );

</span><span class="cx" style="display: block; padding: 0 10px">                $attachment_id = self::factory()->attachment->create_upload_object( $filename, $post_id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // add post thumbnail to post that does not have one

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Add post thumbnail to post that does not have one.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post2  = array( 'post_thumbnail' => $attachment_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $result = $this->myxmlrpcserver->wp_editPost( array( 1, 'author', 'author', $post_id, $post2 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotIXRError( $result );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $attachment_id, get_post_meta( $post_id, '_thumbnail_id', 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">-                // fetch the post to verify that it appears

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Fetch the post to verify that it appears.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $result = $this->myxmlrpcserver->wp_getPost( array( 1, 'author', 'author', $post_id ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotIXRError( $result );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'post_thumbnail', $result );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -162,28 +162,28 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'array', $result['post_thumbnail'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $attachment_id, $result['post_thumbnail']['attachment_id'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // edit the post without supplying a post_thumbnail and check that it didn't change

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Edit the post without supplying a post_thumbnail and check that it didn't change.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post3  = array( 'post_content' => 'Updated post' );

</span><span class="cx" style="display: block; padding: 0 10px">                $result = $this->myxmlrpcserver->wp_editPost( array( 1, 'author', 'author', $post_id, $post3 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotIXRError( $result );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $attachment_id, get_post_meta( $post_id, '_thumbnail_id', 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">-                // create another attachment

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create another attachment.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $attachment2_id = self::factory()->attachment->create_upload_object( $filename, $post_id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // change the post's post_thumbnail

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Change the post's post_thumbnail.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post4  = array( 'post_thumbnail' => $attachment2_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $result = $this->myxmlrpcserver->wp_editPost( array( 1, 'author', 'author', $post_id, $post4 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotIXRError( $result );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $attachment2_id, get_post_meta( $post_id, '_thumbnail_id', 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">-                // unset the post's post_thumbnail

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Unset the post's post_thumbnail.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post5  = array( 'post_thumbnail' => '' );

</span><span class="cx" style="display: block; padding: 0 10px">                $result = $this->myxmlrpcserver->wp_editPost( array( 1, 'author', 'author', $post_id, $post5 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotIXRError( $result );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( '', get_post_meta( $post_id, '_thumbnail_id', 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">-                // use invalid ID

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Use invalid ID.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post6  = array( 'post_thumbnail' => 398420983409 );

</span><span class="cx" style="display: block; padding: 0 10px">                $result = $this->myxmlrpcserver->wp_editPost( array( 1, 'author', 'author', $post_id, $post6 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertIXRError( $result );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -249,7 +249,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_password_transition_unsticky() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // when transitioning to private status or adding a post password, post should be un-stuck

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // When transitioning to private status or adding a post password, post should be un-stuck.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $editor_id = $this->make_user_by_role( 'editor' );

</span><span class="cx" style="display: block; padding: 0 10px">                $post_id   = self::factory()->post->create( array( 'post_author' => $editor_id ) );

</span><span class="cx" style="display: block; padding: 0 10px">                stick_post( $post_id );

</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">                $result = $this->myxmlrpcserver->wp_editPost( array( 1, 'editor', 'editor', $post_id, $struct ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotIXRError( $result );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make sure that the post status is still inherit

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure that the post status is still inherit.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 'inherit', get_post( $post_id )->post_status );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -338,7 +338,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $result = $this->myxmlrpcserver->wp_editPost( array( 1, 'editor', 'editor', $post_id, $struct ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotIXRError( $result );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Make sure that the post status is still inherit

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure that the post status is still inherit.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 'draft', get_post( $post_id )->post_status );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -404,7 +404,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 23219

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_add_enclosure_if_new() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Sample enclosure data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Sample enclosure data.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $enclosure = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'url'    => 'http://example.com/sound.mp3',

</span><span class="cx" style="display: block; padding: 0 10px">                        'length' => 12345,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -411,7 +411,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'type'   => 'audio/mpeg',

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Second sample enclosure data array

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Second sample enclosure data array.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $new_enclosure = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'url'    => 'http://example.com/sound2.mp3',

</span><span class="cx" style="display: block; padding: 0 10px">                        'length' => 12345,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -418,10 +418,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'type'   => 'audio/mpeg',

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Create a test user

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create a test user.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $editor_id = $this->make_user_by_role( 'editor' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Add a dummy post

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Add a dummy post.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post_id = self::factory()->post->create(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_title'   => 'Post Enclosure Test',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -431,33 +431,33 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Add the enclosure as it is added in "do_enclose()"

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Add the enclosure as it is added in "do_enclose()".

</ins><span class="cx" style="display: block; padding: 0 10px">                 $enclosure_string = "{$enclosure['url']}\n{$enclosure['length']}\n{$enclosure['type']}\n";

</span><span class="cx" style="display: block; padding: 0 10px">                add_post_meta( $post_id, 'enclosure', $enclosure_string );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Verify that the correct data is there

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Verify that the correct data is there.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $enclosure_string, get_post_meta( $post_id, 'enclosure', 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">-                // Attempt to add the enclosure a second time

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Attempt to add the enclosure a second time.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->myxmlrpcserver->add_enclosure_if_new( $post_id, $enclosure );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Verify that there is only a single value in the array and that a duplicate is not present

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Verify that there is only a single value in the array and that a duplicate is not present.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 1, count( get_post_meta( $post_id, 'enclosure' ) ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // For good measure, check that the expected value is in the array

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // For good measure, check that the expected value is in the array.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( in_array( $enclosure_string, get_post_meta( $post_id, 'enclosure' ), 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">-                // Attempt to add a brand new enclosure via XML-RPC

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Attempt to add a brand new enclosure via XML-RPC.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->myxmlrpcserver->add_enclosure_if_new( $post_id, $new_enclosure );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Having added the new enclosure, 2 values are expected in the array

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Having added the new enclosure, 2 values are expected in the array.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 2, count( get_post_meta( $post_id, 'enclosure' ) ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check that the new enclosure is in the enclosure meta

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check that the new enclosure is in the enclosure meta.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $new_enclosure_string = "{$new_enclosure['url']}\n{$new_enclosure['length']}\n{$new_enclosure['type']}\n";

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( in_array( $new_enclosure_string, get_post_meta( $post_id, 'enclosure' ), 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">-                // Check that the old enclosure is in the enclosure meta

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check that the old enclosure is in the enclosure meta.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( in_array( $enclosure_string, get_post_meta( $post_id, 'enclosure' ), 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="trunktestsphpunittestsxmlrpcwpeditProfilephp"></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/editProfile.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/editProfile.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/xmlrpc/wp/editProfile.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,7 +28,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotIXRError( $result );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $result );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // verify that the new values were stored

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Verify that the new values were stored.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $user_data = get_userdata( $subscriber_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $new_data['first_name'], $user_data->first_name );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $new_data['last_name'], $user_data->last_name );

</span></span></pre></div>

<a id="trunktestsphpunittestsxmlrpcwpgetCommentphp"></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/getComment.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getComment.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/xmlrpc/wp/getComment.php  2020-01-29 00:43:23 UTC (rev 47122)

</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">                $result = $this->myxmlrpcserver->wp_getComment( array( 1, 'editor', 'editor', self::$parent_comment_id ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotIXRError( $result );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check data types

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check data types.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertInternalType( 'string', $result['user_id'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'string', $result['comment_id'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'IXR_Date', $result['date_created_gmt'] );

</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">                $this->assertInternalType( 'string', $result['author_ip'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'string', $result['type'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check expected values

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check expected values.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertStringMatchesFormat( '%d', $result['user_id'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertStringMatchesFormat( '%d', $result['comment_id'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertStringMatchesFormat( '%d', $result['parent'] );

</span></span></pre></div>

<a id="trunktestsphpunittestsxmlrpcwpgetCommentsphp"></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/getComments.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getComments.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/xmlrpc/wp/getComments.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,7 +76,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotIXRError( $results );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // if no 'number' filter is specified, default should be 10

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If no 'number' filter is specified, default should be 10.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertCount( 10, $results );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $results2 = $this->myxmlrpcserver->wp_getComments(

</span></span></pre></div>

<a id="trunktestsphpunittestsxmlrpcwpgetMediaItemphp"></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/getMediaItem.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getMediaItem.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/xmlrpc/wp/getMediaItem.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,7 +49,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $result = $this->myxmlrpcserver->wp_getMediaItem( array( 1, 'author', 'author', $this->attachment_id, $fields ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotIXRError( $result );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check data types

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check data types.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertInternalType( 'string', $result['attachment_id'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'int', $result['parent'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'string', $result['title'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,7 +60,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'string', $result['thumbnail'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'array', $result['metadata'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check expected values

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check expected values.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertStringMatchesFormat( '%d', $result['attachment_id'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $this->attachment_data['post_title'], $result['title'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( wp_get_attachment_url( $this->attachment_id ), $result['link'] );

</span></span></pre></div>

<a id="trunktestsphpunittestsxmlrpcwpgetOptionsphp"></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/getOptions.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getOptions.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/xmlrpc/wp/getOptions.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,7 +39,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $result = $this->myxmlrpcserver->wp_getOptions( array( 1, 'subscriber', 'subscriber' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'array', $result );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Read Only options

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Read-only options.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 'WordPress', $result['software_name']['value'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $result['software_name']['readonly'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,7 +73,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( current_theme_supports( 'post-thumbnails' ), $result['post_thumbnail']['value'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $result['post_thumbnail']['readonly'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Updatable options

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Updatable options.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( get_option( 'gmt_offset' ), $result['time_zone']['value'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $result['time_zone']['readonly'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,7 +128,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $result = $this->myxmlrpcserver->wp_getOptions( array( 1, 'administrator', 'administrator' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'array', $result );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Read Only options

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Read-only options.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 'WordPress', $result['software_name']['value'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $result['software_name']['readonly'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -162,7 +162,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( current_theme_supports( 'post-thumbnails' ), $result['post_thumbnail']['value'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $result['post_thumbnail']['readonly'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Updatable options

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Updatable options.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( get_option( 'gmt_offset' ), $result['time_zone']['value'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $result['time_zone']['readonly'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunktestsphpunittestsxmlrpcwpgetPagephp"></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/getPage.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getPage.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/xmlrpc/wp/getPage.php     2020-01-29 00:43:23 UTC (rev 47122)

</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">                $result = $this->myxmlrpcserver->wp_getPage( array( 1, self::$post_id, 'editor', 'editor' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotIXRError( $result );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check data types

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check data types.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertInternalType( 'string', $result['userid'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'int', $result['page_id'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'string', $result['page_status'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,7 +71,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $post_data = get_post( self::$post_id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check expected values

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check expected values.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertStringMatchesFormat( '%d', $result['userid'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'future', $result['page_status'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $post_data->post_title, $result['title'] );

</span></span></pre></div>

<a id="trunktestsphpunittestsxmlrpcwpgetPostphp"></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/getPost.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getPost.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/xmlrpc/wp/getPost.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,7 +41,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $result = $this->myxmlrpcserver->wp_getPost( array( 1, 'author', 'author', $this->post_id, $fields ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotIXRError( $result );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check data types

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check data types.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertInternalType( 'string', $result['post_id'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'string', $result['post_title'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'IXR_Date', $result['post_date'] );

</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->assertInternalType( 'array', $result['post_thumbnail'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'array', $result['custom_fields'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check expected values

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check expected values.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertStringMatchesFormat( '%d', $result['post_id'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $this->post_data['post_title'], $result['post_title'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'draft', $result['post_status'] );

</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">                $result = $this->myxmlrpcserver->wp_getPost( array( 1, 'author', 'author', $this->post_id, $fields ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotIXRError( $result );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // when no fields are requested, only the IDs should be returned

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // When no fields are requested, only the IDs should be returned.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 1, count( $result ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array( 'post_id' ), array_keys( $result ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,7 +94,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotIXRError( $result );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'post_id', $result );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertArrayHasKey( 'link', $result ); // random field from 'posts' group

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertArrayHasKey( 'link', $result ); // Random field from 'posts' group.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertArrayHasKey( 'terms', $result );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'custom_fields', $result );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span></span></pre></div>

<a id="trunktestsphpunittestsxmlrpcwpgetPostTypephp"></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/getPostType.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getPostType.php       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/xmlrpc/wp/getPostType.php 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -64,7 +64,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $result = $this->myxmlrpcserver->wp_getPostType( array( 1, 'editor', 'editor', $this->cpt_name, array( 'labels', 'cap', 'menu', 'taxonomies' ) ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotIXRError( $result );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // check data types

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check data types.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertInternalType( 'string', $result['name'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'string', $result['label'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'bool', $result['hierarchical'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,7 +80,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'array', $result['taxonomies'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'array', $result['supports'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // check label data types

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check label data types.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertInternalType( 'string', $result['labels']['name'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'string', $result['labels']['singular_name'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'string', $result['labels']['add_new'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,7 +96,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'string', $result['labels']['menu_name'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'string', $result['labels']['name_admin_bar'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // check cap data types

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check cap data types.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertInternalType( 'string', $result['cap']['edit_post'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'string', $result['cap']['read_post'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'string', $result['cap']['delete_post'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -112,18 +112,18 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'string', $result['cap']['edit_private_posts'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'string', $result['cap']['edit_published_posts'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // check taxonomy data types

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check taxonomy data types.

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $result['taxonomies'] as $taxonomy ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertInternalType( 'string', $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">-                // check taxonomy data types

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check support data types.

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $result['supports'] as $key => $value ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertInternalType( 'string', $key );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertInternalType( 'bool', $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">-                // Check expected values

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check expected values.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $this->cpt_name, $result['name'] );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $this->cpt_args as $key => $value ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $value, $result[ $key ] );

</span></span></pre></div>

<a id="trunktestsphpunittestsxmlrpcwpgetPostTypesphp"></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/getPostTypes.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getPostTypes.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/xmlrpc/wp/getPostTypes.php        2020-01-29 00:43:23 UTC (rev 47122)

</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">                $this->assertNotIXRError( $result );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'array', $result );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // verify that pages is in the result, and post is not

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Verify that page is in the result, and post is not.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $result_names = wp_list_pluck( $result, 'name' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertContains( 'page', $result_names );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotContains( 'post', $result_names );

</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-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/xmlrpc/wp/getPosts.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -64,7 +64,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                )

</span><span class="cx" style="display: block; padding: 0 10px">                        );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // get them all

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Get them all.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $filter  = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'post_type' => $cpt_name,

</span><span class="cx" style="display: block; padding: 0 10px">                        'number'    => $num_posts + 10,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,7 +73,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotIXRError( $results );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $num_posts, count( $results ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // page through results

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Page through results.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $posts_found      = array();

</span><span class="cx" style="display: block; padding: 0 10px">                $filter['number'] = 2;

</span><span class="cx" style="display: block; padding: 0 10px">                $filter['offset'] = 0;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,16 +82,16 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $posts_found       = array_merge( $posts_found, wp_list_pluck( $presults, 'post_id' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $filter['offset'] += $filter['number'];

</span><span class="cx" style="display: block; padding: 0 10px">                } while ( count( $presults ) > 0 );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // verify that $post_ids matches $posts_found

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Verify that $post_ids matches $posts_found.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 0, count( array_diff( $post_ids, $posts_found ) ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // add comments to some of the posts

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Add comments to some of the posts.

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $post_ids as $key => $post_id ) {

<span class="cx" style="display: block; padding: 0 10px">                        // Larger post IDs will get more comments.

</span><span class="cx" style="display: block; padding: 0 10px">                        self::factory()->comment->create_post_comments( $post_id, $key );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // get results ordered by comment count

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Get results ordered by comment count.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $filter2  = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'post_type' => $cpt_name,

</span><span class="cx" style="display: block; padding: 0 10px">                        'number'    => $num_posts,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,7 +107,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $last_comment_count = $comment_count;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // set one of the posts to draft and get drafts

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set one of the posts to draft and get drafts.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post              = get_post( $post_ids[0] );

</span><span class="cx" style="display: block; padding: 0 10px">                $post->post_status = 'draft';

</span><span class="cx" style="display: block; padding: 0 10px">                wp_update_post( $post );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -127,15 +127,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->make_user_by_role( 'editor' );

</span><span class="cx" style="display: block; padding: 0 10px">                self::factory()->post->create();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // check default fields

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check default fields.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $results = $this->myxmlrpcserver->wp_getPosts( array( 1, 'editor', 'editor' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotIXRError( $results );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $expected_fields = array( 'post_id', 'post_title', 'terms', 'custom_fields', 'link' ); // subset of expected fields

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $expected_fields = array( 'post_id', 'post_title', 'terms', 'custom_fields', 'link' ); // Subset of expected fields.

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $expected_fields as $field ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertArrayHasKey( $field, $results[0] );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // request specific fields and verify that only those are returned

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Request specific fields and verify that only those are returned.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $filter   = array();

</span><span class="cx" style="display: block; padding: 0 10px">                $fields   = array( 'post_name', 'post_author', 'enclosure' );

</span><span class="cx" style="display: block; padding: 0 10px">                $results2 = $this->myxmlrpcserver->wp_getPosts( array( 1, 'editor', 'editor', $filter, $fields ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -155,13 +155,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $post_ids[] = self::factory()->post->create( array( 'post_title' => 'First: Hello, World!' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $post_ids[] = self::factory()->post->create( array( 'post_title' => 'Second: Hello, World!' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Search for none of them

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Search for none of them.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $filter  = array( 's' => 'Third' );

</span><span class="cx" style="display: block; padding: 0 10px">                $results = $this->myxmlrpcserver->wp_getPosts( array( 1, 'editor', 'editor', $filter ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotIXRError( $results );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 0, count( $results ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Search for one of them

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Search for one of them.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $filter  = array( 's' => 'First:' );

</span><span class="cx" style="display: block; padding: 0 10px">                $results = $this->myxmlrpcserver->wp_getPosts( array( 1, 'editor', 'editor', $filter ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotIXRError( $results );

</span></span></pre></div>

<a id="trunktestsphpunittestsxmlrpcwpgetRevisionsphp"></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/getRevisions.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getRevisions.php      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/xmlrpc/wp/getRevisions.php        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,7 +38,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'ID'           => $post_id,

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_content' => 'Edit 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">-                ); // Create the initial revision

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         ); // Create the initial revision.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $result = $this->myxmlrpcserver->wp_getRevisions( array( 1, 'editor', 'editor', $post_id ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'array', $result );

</span></span></pre></div>

<a id="trunktestsphpunittestsxmlrpcwpgetTermphp"></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/getTerm.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getTerm.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/xmlrpc/wp/getTerm.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -78,7 +78,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotIXRError( $result );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $result, $term );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check DataTypes

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check data types.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertInternalType( 'string', $result['name'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'string', $result['slug'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'string', $result['taxonomy'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,7 +91,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertStringMatchesFormat( '%d', $result['term_taxonomy_id'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertStringMatchesFormat( '%d', $result['parent'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Check Data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check data.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 0, $result['count'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $term['name'], $result['name'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $term['slug'], $result['slug'] );

</span></span></pre></div>

<a id="trunktestsphpunittestsxmlrpcwpgetTermsphp"></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/getTerms.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getTerms.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/xmlrpc/wp/getTerms.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,7 +41,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_valid_terms() {

</span><span class="cx" style="display: block; padding: 0 10px">                $this->make_user_by_role( 'editor' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // make sure there's at least one category

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Make sure there's at least one category.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $cat = wp_insert_term( 'term_' . __FUNCTION__, 'category' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $results = $this->myxmlrpcserver->wp_getTerms( array( 1, 'editor', 'editor', 'category' ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,10 +50,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $results as $term ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertInternalType( 'int', $term['count'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Check custom term meta

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Check custom term meta.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertInternalType( 'array', $term['custom_fields'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // We expect all other IDs to be strings not integers so we don't return something larger than an XMLRPC integer can describe.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // We expect all other IDs to be strings, not integers,

+                       // so we don't return something larger than an XMLRPC integer can describe.

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertStringMatchesFormat( '%d', $term['term_id'] );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertStringMatchesFormat( '%d', $term['term_group'] );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertStringMatchesFormat( '%d', $term['term_taxonomy_id'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -64,7 +65,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_custom_taxonomy() {

</span><span class="cx" style="display: block; padding: 0 10px">                $this->make_user_by_role( 'editor' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // create a taxonomy and some terms for it

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create a taxonomy and some terms for it.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $tax_name  = 'wp_getTerms_custom_taxonomy';

</span><span class="cx" style="display: block; padding: 0 10px">                $num_terms = 12;

</span><span class="cx" style="display: block; padding: 0 10px">                register_taxonomy( $tax_name, 'post' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,7 +73,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        wp_insert_term( "term_{$i}", $tax_name );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // test fetching all terms

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test fetching all terms.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $results = $this->myxmlrpcserver->wp_getTerms( array( 1, 'editor', 'editor', $tax_name ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotIXRError( $results );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,12 +82,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $tax_name, $term['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">-                // test paged results

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test paged results.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $filter   = array( 'number' => 5 );

</span><span class="cx" style="display: block; padding: 0 10px">                $results2 = $this->myxmlrpcserver->wp_getTerms( array( 1, 'editor', 'editor', $tax_name, $filter ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotIXRError( $results );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 5, count( $results2 ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $results[1]['term_id'], $results2[1]['term_id'] ); // check one of the terms

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertEquals( $results[1]['term_id'], $results2[1]['term_id'] ); // Check one of the terms.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $filter['offset'] = 10;

</span><span class="cx" style="display: block; padding: 0 10px">                $results3         = $this->myxmlrpcserver->wp_getTerms( array( 1, 'editor', 'editor', $tax_name, $filter ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,7 +95,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $num_terms - 10, count( $results3 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $results[11]['term_id'], $results3[1]['term_id'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // test hide_empty (since none have been attached to posts yet, all should be hidden

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test hide_empty (since none have been attached to posts yet, all should be hidden.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $filter   = array( 'hide_empty' => true );

</span><span class="cx" style="display: block; padding: 0 10px">                $results4 = $this->myxmlrpcserver->wp_getTerms( array( 1, 'editor', 'editor', $tax_name, $filter ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotIXRError( $results4 );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -122,7 +123,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $results as $term ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( $term['term_id'] === $cat1 ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                break;  // found cat1 first as expected

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         break; // Found cat1 first as expected.

</ins><span class="cx" style="display: block; padding: 0 10px">                         } elseif ( $term['term_id'] === $cat2 ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->assertFalse( false, 'Incorrect category ordering.' );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -135,7 +136,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $name    = __FUNCTION__;

</span><span class="cx" style="display: block; padding: 0 10px">                $name_id = wp_create_category( $name );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // search by full name

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Search by full name.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $filter  = array( 'search' => $name );

</span><span class="cx" style="display: block; padding: 0 10px">                $results = $this->myxmlrpcserver->wp_getTerms( array( 1, 'editor', 'editor', 'category', $filter ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotIXRError( $results );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -143,7 +144,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $name, $results[0]['name'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $name_id, $results[0]['term_id'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // search by partial name

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Search by partial name.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $filter   = array( 'search' => substr( $name, 0, 10 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $results2 = $this->myxmlrpcserver->wp_getTerms( array( 1, 'editor', 'editor', 'category', $filter ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotIXRError( $results2 );

</span></span></pre></div>

<a id="trunktestsphpunittestsxmlrpcwpgetUserphp"></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/getUser.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getUser.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/xmlrpc/wp/getUser.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,7 +10,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function setUp() {

</span><span class="cx" style="display: block; padding: 0 10px">                parent::setUp();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // create a super-admin

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create a super admin.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->administrator_id = $this->make_user_by_role( 'administrator' );

</span><span class="cx" style="display: block; padding: 0 10px">                if ( is_multisite() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        grant_super_admin( $this->administrator_id );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,7 +75,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $result = $this->myxmlrpcserver->wp_getUser( array( 1, 'administrator', 'administrator', $user_id ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotIXRError( $result );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // check data types

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check data types.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertInternalType( 'string', $result['user_id'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertStringMatchesFormat( '%d', $result['user_id'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'string', $result['username'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -90,7 +90,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'string', $result['display_name'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'array', $result['roles'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // check expected values

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check expected values.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $user_id, $result['user_id'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $user_data['user_login'], $result['username'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $user_data['first_name'], $result['first_name'] );

</span></span></pre></div>

<a id="trunktestsphpunittestsxmlrpcwpgetUsersphp"></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/getUsers.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getUsers.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/xmlrpc/wp/getUsers.php    2020-01-29 00:43:23 UTC (rev 47122)

</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">                $result = $this->myxmlrpcserver->wp_getUsers( array( 1, 'administrator', 'administrator' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotIXRError( $result );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // check data types

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check data types.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertInternalType( 'string', $result[0]['user_id'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertStringMatchesFormat( '%d', $result[0]['user_id'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'string', $result[0]['username'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,7 +62,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        grant_super_admin( $administrator_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">-                // test a single role ('editor')

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test a single role ('editor').

</ins><span class="cx" style="display: block; padding: 0 10px">                 $filter  = array( 'role' => 'editor' );

</span><span class="cx" style="display: block; padding: 0 10px">                $results = $this->myxmlrpcserver->wp_getUsers( array( 1, 'administrator', 'administrator', $filter ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotIXRError( $results );

</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">                $this->assertCount( 1, $results );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $editor_id, $results[0]['user_id'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // test 'authors', which should return all non-subscribers

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test 'authors', which should return all non-subscribers.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $filter2  = array( 'who' => 'authors' );

</span><span class="cx" style="display: block; padding: 0 10px">                $results2 = $this->myxmlrpcserver->wp_getUsers( array( 1, 'administrator', 'administrator', $filter2 ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotIXRError( $results2 );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -101,7 +101,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $filter['offset'] += $page_size;

</span><span class="cx" style="display: block; padding: 0 10px">                } while ( count( $presults ) > 0 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // verify that $user_ids matches $users_found

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Verify that $user_ids matches $users_found.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 0, count( array_diff( $user_ids, $users_found ) ) );

</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="trunktestsphpunittestsxmlrpcwpnewCommentphp"></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/newComment.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/newComment.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/xmlrpc/wp/newComment.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,11 +84,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // First time it's a valid comment

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // First time it's a valid comment.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $result = $this->myxmlrpcserver->wp_newComment( $comment_args );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotIXRError( $result );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Run second time for duplication error

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Run second time for duplication error.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $result = $this->myxmlrpcserver->wp_newComment( $comment_args );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertIXRError( $result );

</span></span></pre></div>

<a id="trunktestsphpunittestsxmlrpcwpnewPostphp"></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/newPost.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/newPost.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/xmlrpc/wp/newPost.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -150,7 +150,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->make_user_by_role( 'author' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // create attachment

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create attachment.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $filename      = ( DIR_TESTDATA . '/images/a2-small.jpg' );

</span><span class="cx" style="display: block; padding: 0 10px">                $attachment_id = self::factory()->attachment->create_upload_object( $filename );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -312,7 +312,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $cat1      = wp_create_category( $cat1_name, $parent_cat );

</span><span class="cx" style="display: block; padding: 0 10px">                $cat2_name = 'cat2';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // first a post with valid categories; one that already exists and one to be created

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // First a post with valid categories; one that already exists and one to be created.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post   = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'post_title'  => 'Test',

</span><span class="cx" style="display: block; padding: 0 10px">                        'terms_names' => array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -321,15 +321,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $result = $this->myxmlrpcserver->wp_newPost( array( 1, 'editor', 'editor', $post ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotIXRError( $result );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // verify that cat2 was created

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Verify that cat2 was created.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $cat2 = get_term_by( 'name', $cat2_name, 'category' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEmpty( $cat2 );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // check that both categories were set on the post

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check that both categories were set on the post.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post_cats = wp_get_object_terms( $result, 'category', array( 'fields' => 'ids' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertContains( $cat1, $post_cats );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertContains( $cat2->term_id, $post_cats );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // create a second post attempting to use the ambiguous name

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create a second post attempting to use the ambiguous name.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post2   = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'post_title'  => 'Test',

</span><span class="cx" style="display: block; padding: 0 10px">                        'terms_names' => array(

</span></span></pre></div>

<a id="trunktestsphpunittestsxmlrpcwprestoreRevisionphp"></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/restoreRevision.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/restoreRevision.php   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/xmlrpc/wp/restoreRevision.php     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,7 +10,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function setUp() {

</span><span class="cx" style="display: block; padding: 0 10px">                parent::setUp();

</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 = self::factory()->post->create( array( 'post_content' => 'edit1' ) ); // Not saved as a revision

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->post_id = self::factory()->post->create( array( 'post_content' => 'edit1' ) ); // Not saved as a revision.

</ins><span class="cx" style="display: block; padding: 0 10px">                 // First saved revision on update, see https://core.trac.wordpress.org/changeset/24650

</span><span class="cx" style="display: block; padding: 0 10px">                wp_insert_post(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,7 +20,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">                $revisions = wp_get_post_revisions( $this->post_id );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //$revision = array_shift( $revisions ); // First revision is empty - https://core.trac.wordpress.org/changeset/23842

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // First revision is empty, see https://core.trac.wordpress.org/changeset/23842

+               // $revision = array_shift( $revisions );

</ins><span class="cx" style="display: block; padding: 0 10px">                 // First revision is NOT empty, see https://core.trac.wordpress.org/changeset/24650

</span><span class="cx" style="display: block; padding: 0 10px">                $revision          = array_shift( $revisions );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->revision_id = $revision->ID;

</span></span></pre></div>

<a id="trunktestsphpunittestsxmlrpcwpsetOptionsphp"></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/setOptions.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/setOptions.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/xmlrpc/wp/setOptions.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,7 +10,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_set_option_no_escape_strings() {

</span><span class="cx" style="display: block; padding: 0 10px">                $this->make_user_by_role( 'administrator' );

</span><span class="cx" style="display: block; padding: 0 10px">                $string_with_quote         = "Mary's Lamb Shop";

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $escaped_string_with_quote = esc_html( $string_with_quote ); // title is passed through esc_html()

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $escaped_string_with_quote = esc_html( $string_with_quote ); // Title is passed through esc_html().

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'default_comment_status', 'closed' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'closed', get_option( 'default_comment_status' ) );

</span></span></pre></div>

<a id="trunktestsphpunittestsxmlrpcwpuploadFilephp"></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/uploadFile.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/uploadFile.php        2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/tests/xmlrpc/wp/uploadFile.php  2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,7 +14,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_valid_attachment() {

</span><span class="cx" style="display: block; padding: 0 10px">                $this->make_user_by_role( 'editor' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // create attachment

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Create attachment.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $filename = ( DIR_TESTDATA . '/images/a2-small.jpg' );

</span><span class="cx" style="display: block; padding: 0 10px">                $contents = file_get_contents( $filename );

</span><span class="cx" style="display: block; padding: 0 10px">                $data     = array(

</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">                $result = $this->myxmlrpcserver->mw_newMediaObject( array( 0, 'editor', 'editor', $data ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotIXRError( $result );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // check data types

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Check data types.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertInternalType( 'string', $result['id'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertStringMatchesFormat( '%d', $result['id'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'string', $result['file'] );

</span></span></pre></div>

<a id="trunktestsphpunitwpmailrealtestphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/wp-mail-real-test.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/wp-mail-real-test.php 2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/phpunit/wp-mail-real-test.php   2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,7 +5,7 @@

<span class="cx" style="display: block; padding: 0 10px">  * Test script for wp_mail with real addresses.

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// parse options

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Parse options.

</ins><span class="cx" style="display: block; padding: 0 10px"> $options = 'v:r:d';

</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_callable( 'getopt' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">        $opts = getopt( $options );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,24 +27,24 @@

</span><span class="cx" style="display: block; padding: 0 10px">        define( 'DIR_WP', DIR_TESTROOT . '/wordpress' );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// make sure all useful errors are displayed during setup

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Make sure all useful errors are displayed during setup.

</ins><span class="cx" style="display: block; padding: 0 10px"> error_reporting( E_ALL & ~E_DEPRECATED );

</span><span class="cx" style="display: block; padding: 0 10px"> ini_set( 'display_errors', true );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> require_once( DIR_TESTROOT . '/wp-testlib/utils.php' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// configure wp

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Configure WP.

</ins><span class="cx" style="display: block; padding: 0 10px"> require_once( DIR_TESTROOT . '/wp-config.php' );

</span><span class="cx" style="display: block; padding: 0 10px"> define( 'ABSPATH', realpath( DIR_WP ) . '/' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// install wp

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Install WP.

</ins><span class="cx" style="display: block; padding: 0 10px"> define( 'WP_BLOG_TITLE', rand_str() );

</span><span class="cx" style="display: block; padding: 0 10px"> define( 'WP_USER_NAME', rand_str() );

</span><span class="cx" style="display: block; padding: 0 10px"> define( 'WP_USER_EMAIL', rand_str() . '@example.com' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// initialize wp

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Initialize WP.

</ins><span class="cx" style="display: block; padding: 0 10px"> define( 'WP_INSTALLING', 1 );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$_SERVER['PATH_INFO'] = $_SERVER['SCRIPT_NAME']; // prevent a warning from some sloppy code in wp-settings.php

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$_SERVER['PATH_INFO'] = $_SERVER['SCRIPT_NAME']; // Prevent a warning from some sloppy code in wp-settings.php.

</ins><span class="cx" style="display: block; padding: 0 10px"> require_once( ABSPATH . 'wp-settings.php' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> drop_tables();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,7 +52,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );

</span><span class="cx" style="display: block; padding: 0 10px"> wp_install( WP_BLOG_TITLE, WP_USER_NAME, WP_USER_EMAIL, 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">-// make sure we're installed

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Make sure we're installed.

</ins><span class="cx" style="display: block; padding: 0 10px"> assert( true === is_blog_installed() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> // phpcs:ignore Generic.NamingConventions.UpperCaseConstantName.ConstantNotUpperCase

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -59,7 +59,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> define( 'PHPUnit_MAIN_METHOD', false );

</span><span class="cx" style="display: block; padding: 0 10px"> $original_wpdb = $GLOBALS['wpdb'];

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// hide warnings during testing, since that's the normal WP behaviour

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Hide warnings during testing, since that's the normal WP behaviour.

</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! WP_DEBUG ) {

</span><span class="cx" style="display: block; padding: 0 10px">        error_reporting( E_ALL ^ E_NOTICE );

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span></span></pre></div>

<a id="trunktestsqunitfixturescustomizemenusjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/qunit/fixtures/customize-menus.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/qunit/fixtures/customize-menus.js     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/qunit/fixtures/customize-menus.js       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -119,7 +119,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        'instanceNumber': 2

</span><span class="cx" style="display: block; padding: 0 10px"> };

</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 Locations

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Nav Menu Locations.

</ins><span class="cx" style="display: block; padding: 0 10px"> window._wpCustomizeSettings.sections.menu_locations = {

</span><span class="cx" style="display: block; padding: 0 10px">        'id': 'menu_locations',

</span><span class="cx" style="display: block; padding: 0 10px">        'description': '<p>Your theme contains 1 menu location. Select which menu you would like to use.<\/p><p>You can also place menus in widget areas with the Custom Menu widget.<\/p>',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -169,7 +169,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        'type': 'nav_menu_location'

</span><span class="cx" style="display: block; padding: 0 10px"> };

</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 Menus

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Nav Menus.

</ins><span class="cx" style="display: block; padding: 0 10px"> window._wpCustomizeSettings.sections['nav_menu[3]'] = {

</span><span class="cx" style="display: block; padding: 0 10px">        'id': 'nav_menu[3]',

</span><span class="cx" style="display: block; padding: 0 10px">        'description': '',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -218,7 +218,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        'dirty': 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">-// Menu items

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Menu items.

</ins><span class="cx" style="display: block; padding: 0 10px"> window._wpCustomizeSettings.settings['nav_menu_item[2000]'] = {

</span><span class="cx" style="display: block; padding: 0 10px">        'dirty': false,

</span><span class="cx" style="display: block; padding: 0 10px">        'transport': 'postMessage',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -370,7 +370,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        'xfn': ''

</span><span class="cx" style="display: block; padding: 0 10px"> };

</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 controls

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Meta controls.

</ins><span class="cx" style="display: block; padding: 0 10px"> window._wpCustomizeSettings.sections.add_menu = {

</span><span class="cx" style="display: block; padding: 0 10px">        'id': 'add_menu',

</span><span class="cx" style="display: block; padding: 0 10px">        'description': '',

</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">        'instanceNumber': 46

</span><span class="cx" style="display: block; padding: 0 10px"> };

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// From nav-menu.js

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// From nav-menu.js.

</ins><span class="cx" style="display: block; padding: 0 10px"> window.wpNavMenu = {

</span><span class="cx" style="display: block; padding: 0 10px">        'options': {

</span><span class="cx" style="display: block; padding: 0 10px">                'menuItemDepthPerLevel': 30,

</span></span></pre></div>

<a id="trunktestsqunitfixturesupdatesjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/qunit/fixtures/updates.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/qunit/fixtures/updates.js     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/qunit/fixtures/updates.js       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,8 +27,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                'themeInstalled': 'Installed!',

</span><span class="cx" style="display: block; padding: 0 10px">                'installFailedShort': 'Install Failed!',

</span><span class="cx" style="display: block; padding: 0 10px">                'installFailed': 'Installation failed: %s',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                'pluginInstallingLabel': 'Installing %s...', // No ellipsis

-               'themeInstallingLabel': 'Installing %s...', // No ellipsis

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         'pluginInstallingLabel': 'Installing %s...', // No ellipsis.

+               'themeInstallingLabel': 'Installing %s...', // No ellipsis.

</ins><span class="cx" style="display: block; padding: 0 10px">                 'pluginInstalledLabel': '%s installed!',

</span><span class="cx" style="display: block; padding: 0 10px">                'themeInstalledLabel': '%s installed!',

</span><span class="cx" style="display: block; padding: 0 10px">                'pluginInstallFailedLabel': '%s installation failed',

</span></span></pre></div>

<a id="trunktestsqunitfixtureswpapijs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/qunit/fixtures/wp-api.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/qunit/fixtures/wp-api.js      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/qunit/fixtures/wp-api.js        2020-01-29 00:43:23 UTC (rev 47122)

</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">        param.success( data );

</span><span class="cx" style="display: block; padding: 0 10px">        var deferred = jQuery.Deferred();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Resolve the deferred with the mocked data

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Resolve the deferred with the mocked data.

</ins><span class="cx" style="display: block; padding: 0 10px">         deferred.resolve( data );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">        // Return the deferred promise that will resolve with the expected data.

</span></span></pre></div>

<a id="trunktestsqunitwpadminjscustomizebasejs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/qunit/wp-admin/js/customize-base.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/qunit/wp-admin/js/customize-base.js   2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/qunit/wp-admin/js/customize-base.js     2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,7 +48,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        });

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">        // @todo Test Class.applicator?

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // @todo do we test object.instance?

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // @todo Do we test object.instance?

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        module( 'Customize Base: Subclass' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,7 +82,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        });

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Implements todo : Test Class.constructor() manipulation

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Implements todo: Test Class.constructor() manipulation.

</ins><span class="cx" style="display: block; padding: 0 10px">         module( 'Customize Base: Constructor Manipulation' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        newConstructor = function ( instanceProps ) {

</span></span></pre></div>

<a id="trunktestsqunitwpadminjscustomizecontrolsjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/qunit/wp-admin/js/customize-controls.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/qunit/wp-admin/js/customize-controls.js       2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/qunit/wp-admin/js/customize-controls.js 2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -462,7 +462,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                id: sectionId,

</span><span class="cx" style="display: block; padding: 0 10px">                content: sectionContent,

</span><span class="cx" style="display: block; padding: 0 10px">                priority: 100,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                active: true // @todo This should default to true

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         active: true // @todo This should default to true.

</ins><span class="cx" style="display: block; padding: 0 10px">         };

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        testCustomizerModel( mockSection, sectionExpectedValues );

</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">                label: controlLabel,

</span><span class="cx" style="display: block; padding: 0 10px">                settings: { 'default': 'new_blogname' },

</span><span class="cx" style="display: block; padding: 0 10px">                type: controlType,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                active: true // @todo This should default to true

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         active: true // @todo This should default to true.

</ins><span class="cx" style="display: block; padding: 0 10px">         };

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        mockControl = new wp.customize.Control( controlId, {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -566,7 +566,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                content: panelContent,

</span><span class="cx" style="display: block; padding: 0 10px">                title: panelTitle,

</span><span class="cx" style="display: block; padding: 0 10px">                description: panelDescription,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                active: true, // @todo This should default to true

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         active: true, // @todo This should default to true.

</ins><span class="cx" style="display: block; padding: 0 10px">                 type: 'default'

</span><span class="cx" style="display: block; padding: 0 10px">        };

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -743,7 +743,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                day( '3' );

</span><span class="cx" style="display: block; padding: 0 10px">                assert.ok( ! control.invalidDate );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test control.parseDateTime();

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test control.parseDateTime().

</ins><span class="cx" style="display: block; padding: 0 10px">                 control.params.twelveHourFormat = false;

</span><span class="cx" style="display: block; padding: 0 10px">                dateTimeArray = control.parseDateTime( datetime );

</span><span class="cx" style="display: block; padding: 0 10px">                assert.deepEqual( dateTimeArray, {

</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">                assert.equal( timeString, '2010-12-18' );

</span><span class="cx" style="display: block; padding: 0 10px">                control.params.includeTime = true;

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test control.updateDaysForMonth();.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test control.updateDaysForMonth().

</ins><span class="cx" style="display: block; padding: 0 10px">                 year( 2017 );

</span><span class="cx" style="display: block; padding: 0 10px">                month( 2 );

</span><span class="cx" style="display: block; padding: 0 10px">                day( 28 );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -810,7 +810,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                control.toggleFutureDateNotification( false );

</span><span class="cx" style="display: block; padding: 0 10px">                assert.notOk( control.notifications.has( 'not_future_date' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test control.populateDateInputs();

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test control.populateDateInputs().

</ins><span class="cx" style="display: block; padding: 0 10px">                 control.setting._value = '2000-12-30 12:34:56';

</span><span class="cx" style="display: block; padding: 0 10px">                control.populateDateInputs();

</span><span class="cx" style="display: block; padding: 0 10px">                assert.equal( '2000', control.inputElements.year.get() );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -820,7 +820,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                assert.equal( '34', control.inputElements.minute.get() );

</span><span class="cx" style="display: block; padding: 0 10px">                assert.equal( 'pm', control.inputElements.meridian.get() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test control.validateInputs();

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test control.validateInputs().

</ins><span class="cx" style="display: block; padding: 0 10px">                 hour( 33 );

</span><span class="cx" style="display: block; padding: 0 10px">                assert.ok( control.validateInputs() );

</span><span class="cx" style="display: block; padding: 0 10px">                hour( 10 );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -830,7 +830,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                minute( 20 );

</span><span class="cx" style="display: block; padding: 0 10px">                assert.notOk( control.validateInputs() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test control.populateSetting();

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test control.populateSetting().

</ins><span class="cx" style="display: block; padding: 0 10px">                 day( 2 );

</span><span class="cx" style="display: block; padding: 0 10px">                month( 11 );

</span><span class="cx" style="display: block; padding: 0 10px">                year( 2018 );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -848,7 +848,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                control.populateSetting();

</span><span class="cx" style="display: block; padding: 0 10px">                assert.equal( control.setting(), '2018-11-02 17:20:00' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test control.isFutureDate();

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test control.isFutureDate().

</ins><span class="cx" style="display: block; padding: 0 10px">                 day( 2 );

</span><span class="cx" style="display: block; padding: 0 10px">                month( 11 );

</span><span class="cx" style="display: block; padding: 0 10px">                year( 2318 );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -860,7 +860,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                year( 2016 );

</span><span class="cx" style="display: block; padding: 0 10px">                assert.notOk( control.isFutureDate() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Tear Down.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Tear down.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp.customize.control.remove( controlId );

</span><span class="cx" style="display: block; padding: 0 10px">        });

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -895,7 +895,7 @@

<span class="cx" style="display: block; padding: 0 10px">                assert.notOk( section.container.hasClass( 'open' ) ); // Ensure it does not affect other sections state.

</span><span class="cx" style="display: block; padding: 0 10px">                assert.ok( defaultSection.expanded() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Tear down

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Tear down.

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp.customize.section.remove( sectionId );

</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="trunktestsqunitwpadminjscustomizenavmenusjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/qunit/wp-admin/js/customize-nav-menus.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/qunit/wp-admin/js/customize-nav-menus.js      2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/qunit/wp-admin/js/customize-nav-menus.js        2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +8,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        module( 'Customize Nav Menus' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Generate 20 ids and verify they are all unique.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Generate 20 IDs and verify they are all unique.

</ins><span class="cx" style="display: block; padding: 0 10px">          */

</span><span class="cx" style="display: block; padding: 0 10px">        test( 'generatePlaceholderAutoIncrementId generates unique IDs', function() {

</span><span class="cx" style="display: block; padding: 0 10px">                var testIterations = 20,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,7 +36,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                ok( 0 !== wp.customize.Menus.getMenuControl( primaryMenuId ).getMenuItemControls().length, 'non-empty menus' );

</span><span class="cx" style="display: block; padding: 0 10px">        } );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // @todo Add tests for api.Menus.AvailableMenuItemsPanelView (and api.Menus.AvailableItemCollection, api.Menus.AvailableItemCollection, api.Menus.AvailableItemModel)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // @todo Add tests for api.Menus.AvailableMenuItemsPanelView

+       // (and api.Menus.AvailableItemCollection, api.Menus.AvailableItemModel).

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        test( 'there is a properly configured MenusPanel', function() {

</span><span class="cx" style="display: block; padding: 0 10px">                var panel, sections;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,7 +51,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                ok( sections[1].extended( api.Menus.MenuSection ), 'second section is MenuSection' );

</span><span class="cx" style="display: block; padding: 0 10px">                ok( sections[ sections.length - 1 ].extended( api.Menus.NewMenuSection ), 'last section is NewMenuSection' );

</span><span class="cx" style="display: block; padding: 0 10px">        } );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // @todo Add more tests for api.Menus.MenusPanel behaviors

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // @todo Add more tests for api.Menus.MenusPanel behaviors.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        test( 'there an expected MenuSection for the primary menu', function() {

</span><span class="cx" style="display: block; padding: 0 10px">                var section, controls, lastControl;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -70,7 +71,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                ok( lastControl.extended( api.Control ), 'last control in menu section is a base Control' );

</span><span class="cx" style="display: block; padding: 0 10px">                ok( lastControl.params.templateId === 'nav-menu-delete-button', 'last control in menu section has a delete-button template' );

</span><span class="cx" style="display: block; padding: 0 10px">        } );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // @todo Add more tests for api.Menus.MenuSection behaviors

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // @todo Add more tests for api.Menus.MenuSection behaviors.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        test( 'changing a MenuNameControl change the corresponding menu value', function() {

</span><span class="cx" style="display: block; padding: 0 10px">                var section, control;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -104,18 +105,18 @@

</span><span class="cx" style="display: block; padding: 0 10px">                equal( value.position, 1 );

</span><span class="cx" style="display: block; padding: 0 10px">                equal( control.priority(), 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">-                // @todo test control.moveDown();

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // @todo Test control.moveDown().

</ins><span class="cx" style="display: block; padding: 0 10px">         } );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // @todo Add more tests for api.Menus.MenuItemControl

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // @todo Add more tests for api.Menus.MenuItemControl.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // @todo Add tests for api.Menus.NewMenuSection

-       // @todo Add tests for api.Menus.MenuLocationControl

-       // @todo Add tests for api.Menus.MenuLocationsControl

-       // @todo Add tests for api.Menus.MenuAutoAddControl

-       // @todo Add tests for api.Menus.MenuControl

-       // @todo Add tests for api.Menus.applySavedData

-       // @todo Add tests for api.Menus.focusMenuItemControl

-       // @todo Add tests for api.Menus.createNavMenu

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // @todo Add tests for api.Menus.NewMenuSection.

+       // @todo Add tests for api.Menus.MenuLocationControl.

+       // @todo Add tests for api.Menus.MenuLocationsControl.

+       // @todo Add tests for api.Menus.MenuAutoAddControl.

+       // @todo Add tests for api.Menus.MenuControl.

+       // @todo Add tests for api.Menus.applySavedData.

+       // @todo Add tests for api.Menus.focusMenuItemControl.

+       // @todo Add tests for api.Menus.createNavMenu.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        test( 'api.Menus.getMenuControl() should return the expected control', function() {

</span><span class="cx" style="display: block; padding: 0 10px">                var control = api.Menus.getMenuControl( primaryMenuId );

</span></span></pre></div>

<a id="trunktestsqunitwpadminjspasswordstrengthmeterjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/qunit/wp-admin/js/password-strength-meter.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/qunit/wp-admin/js/password-strength-meter.js  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/qunit/wp-admin/js/password-strength-meter.js    2020-01-29 00:43:23 UTC (rev 47122)

</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">                        for ( i = 0, n = possibility.length; i < length; i++ ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                retVal += possibility.charAt( Math.floor( Math.random() * n ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return retVal + 'aB2'; // add a lower case, uppercase and number just to make sure we always have one of each

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return retVal + 'aB2'; // Add a lower case, uppercase and number just to make sure we always have one of each.

</ins><span class="cx" style="display: block; padding: 0 10px">                 },

</span><span class="cx" style="display: block; padding: 0 10px">                twofifty = password( 250 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunktestsqunitwpadminjsupdatesjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/qunit/wp-admin/js/updates.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/qunit/wp-admin/js/updates.js  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/qunit/wp-admin/js/updates.js    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,7 +21,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                wp.updates.decrementCount( 'plugin' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Re-read these values

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Re-read these values.

</ins><span class="cx" style="display: block; padding: 0 10px">                 menuItemCount  = $( '#menu-plugins' ).find( '.plugin-count' ).eq( 0 ).text();

</span><span class="cx" style="display: block; padding: 0 10px">                screenReaderItemCount = $( '#wp-admin-bar-updates' ).find( '.screen-reader-text' ).text();

</span><span class="cx" style="display: block; padding: 0 10px">                adminItemCount = $( '#wp-admin-bar-updates' ).find( '.ab-label' ).text();

</span></span></pre></div>

<a id="trunktestsqunitwpadminjswidgetstestmediaimagewidgetjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/qunit/wp-admin/js/widgets/test-media-image-widget.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/qunit/wp-admin/js/widgets/test-media-image-widget.js  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/qunit/wp-admin/js/widgets/test-media-image-widget.js    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,7 +62,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                imageWidgetControlInstance.$el.find( '.title' ).val( 'Chicken and Ribs' ).trigger( 'input' );

</span><span class="cx" style="display: block; padding: 0 10px">                equal( imageWidgetModelInstance.get( 'title' ), 'Chicken and Ribs', 'Changing title should update model title attribute' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Test mapMediaToModelProps

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Test mapMediaToModelProps.

</ins><span class="cx" style="display: block; padding: 0 10px">                 mappedProps = imageWidgetControlInstance.mapMediaToModelProps( { link: 'file', url: testImageUrl } );

</span><span class="cx" style="display: block; padding: 0 10px">                equal( mappedProps.link_url, testImageUrl, 'mapMediaToModelProps should set file link_url according to mediaFrameProps.link' );

</span><span class="cx" style="display: block; padding: 0 10px">                mappedProps = imageWidgetControlInstance.mapMediaToModelProps( { link: 'post', postUrl: 'https://wordpress.org/image-2/' } );

</span></span></pre></div>

<a id="trunktestsqunitwpincludesjsshortcodejs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/qunit/wp-includes/js/shortcode.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/qunit/wp-includes/js/shortcode.js     2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/qunit/wp-includes/js/shortcode.js       2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,7 +5,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        test( 'next() should find the shortcode', function() {

</span><span class="cx" style="display: block; padding: 0 10px">                var result;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Basic

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Basic.

</ins><span class="cx" style="display: block; padding: 0 10px">                 result = wp.shortcode.next( 'foo', 'this has the [foo] shortcode' );

</span><span class="cx" style="display: block; padding: 0 10px">                equal( result.index, 13, 'foo shortcode found at index 13' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,7 +16,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        test( 'next() should not find shortcodes that are not there', function() {

</span><span class="cx" style="display: block; padding: 0 10px">                var result;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Not found

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Not found.

</ins><span class="cx" style="display: block; padding: 0 10px">                 result = wp.shortcode.next( 'bar', 'this has the [foo] shortcode' );

</span><span class="cx" style="display: block; padding: 0 10px">                equal( result, undefined, 'bar shortcode not found' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,7 +27,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        test( 'next() should find the shortcode when told to start looking beyond the start of the string', function() {

</span><span class="cx" style="display: block; padding: 0 10px">                var result;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Starting at indices

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Starting at indices.

</ins><span class="cx" style="display: block; padding: 0 10px">                 result = wp.shortcode.next( 'foo', 'this has the [foo] shortcode', 12 );

</span><span class="cx" style="display: block; padding: 0 10px">                equal( result.index, 13, 'foo shortcode found before index 13' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,7 +49,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        test( 'next() should not find escaped shortcodes', function() {

</span><span class="cx" style="display: block; padding: 0 10px">                var result;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Escaped

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Escaped.

</ins><span class="cx" style="display: block; padding: 0 10px">                 result = wp.shortcode.next( 'foo', 'this has the [[foo]] shortcode' );

</span><span class="cx" style="display: block; padding: 0 10px">                equal( result, undefined, 'foo shortcode not found when escaped' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -88,7 +88,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        test( 'next() should not find shortcodes that are not full matches', function() {

</span><span class="cx" style="display: block; padding: 0 10px">                var result;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Stubs

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Stubs.

</ins><span class="cx" style="display: block; padding: 0 10px">                 result = wp.shortcode.next( 'foo', 'this has the [foobar] shortcode' );

</span><span class="cx" style="display: block; padding: 0 10px">                equal( result, undefined, 'stub does not trigger match' );

</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">        test( 'replace() should replace the shortcode', function() {

</span><span class="cx" style="display: block; padding: 0 10px">                var result;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Basic

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Basic.

</ins><span class="cx" style="display: block; padding: 0 10px">                 result = wp.shortcode.replace( 'foo', 'this has the [foo] shortcode', shortcodeReplaceCallback );

</span><span class="cx" style="display: block; padding: 0 10px">                equal( result, 'this has the bar shortcode', 'foo replaced with bar' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -110,7 +110,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        test( 'replace() should not replace the shortcode when it does not match', function() {

</span><span class="cx" style="display: block; padding: 0 10px">                var result;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Not found

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Not found.

</ins><span class="cx" style="display: block; padding: 0 10px">                 result = wp.shortcode.replace( 'bar', 'this has the [foo] shortcode', shortcodeReplaceCallback );

</span><span class="cx" style="display: block; padding: 0 10px">                equal( result, 'this has the [foo] shortcode', 'bar not found' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -121,7 +121,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        test( 'replace() should replace the shortcode in all instances of its use', function() {

</span><span class="cx" style="display: block; padding: 0 10px">                var result;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Multiple instances

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Multiple instances.

</ins><span class="cx" style="display: block; padding: 0 10px">                 result = wp.shortcode.replace( 'foo', 'this has the [foo] shortcode [foo] twice', shortcodeReplaceCallback );

</span><span class="cx" style="display: block; padding: 0 10px">                equal( result, 'this has the bar shortcode bar twice', 'foo replaced with bar twice' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -132,7 +132,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        test( 'replace() should not replace the escaped shortcodes', function() {

</span><span class="cx" style="display: block; padding: 0 10px">                var result;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Escaped

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Escaped.

</ins><span class="cx" style="display: block; padding: 0 10px">                 result = wp.shortcode.replace( 'foo', 'this has the [[foo]] shortcode', shortcodeReplaceCallback );

</span><span class="cx" style="display: block; padding: 0 10px">                equal( result, 'this has the [[foo]] shortcode', 'escaped foo not replaced' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -156,7 +156,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        test( 'replace() should not replace the shortcode when it is an incomplete match', function() {

</span><span class="cx" style="display: block; padding: 0 10px">                var result;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Stubs

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Stubs.

</ins><span class="cx" style="display: block; padding: 0 10px">                 result = wp.shortcode.replace( 'foo', 'this has the [foobar] shortcode', shortcodeReplaceCallback );

</span><span class="cx" style="display: block; padding: 0 10px">                equal( result, 'this has the [foobar] shortcode', 'stub not replaced' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -164,7 +164,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                equal( result, 'this has the [foo] shortcode', 'stub not replaced' );

</span><span class="cx" style="display: block; padding: 0 10px">        });

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-    // A callback function for the replace tests

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**

+        * A callback function for the replace tests.

+        */

</ins><span class="cx" style="display: block; padding: 0 10px">         function shortcodeReplaceCallback( ) {

</span><span class="cx" style="display: block; padding: 0 10px">                return 'bar';

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span></span></pre></div>

<a id="trunktestsqunitwpincludesjstinymcepluginswptextpatternpluginjs"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/qunit/wp-includes/js/tinymce/plugins/wptextpattern/plugin.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/qunit/wp-includes/js/tinymce/plugins/wptextpattern/plugin.js  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/tests/qunit/wp-includes/js/tinymce/plugins/wptextpattern/plugin.js    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,12 +31,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        editor.dom.fire(target, type, evt);

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Numeric keyCode

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Numeric keyCode.

</ins><span class="cx" style="display: block; padding: 0 10px">                 if (typeof(chr) === 'number') {

</span><span class="cx" style="display: block; padding: 0 10px">                        charCode = chr;

</span><span class="cx" style="display: block; padding: 0 10px">                        keyCode = charCodeToKeyCode(charCode);

</span><span class="cx" style="display: block; padding: 0 10px">                } else if (typeof(chr) === 'string') {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // String value

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // String value.

</ins><span class="cx" style="display: block; padding: 0 10px">                         if (chr === '\b') {

</span><span class="cx" style="display: block; padding: 0 10px">                                keyCode = 8;

</span><span class="cx" style="display: block; padding: 0 10px">                                charCode = chr.charCodeAt(0);

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -85,8 +85,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                                startContainer = nodes[nodes.length - 1];

</span><span class="cx" style="display: block; padding: 0 10px">                                        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        // If caret is at <p>abc|</p> and after the abc text node then move it to the end of the text node

-                                       // Expand the range to include the last char <p>ab[c]</p> since IE 11 doesn't delete otherwise

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // If caret is at abc| and after the abc text node then move it to the end of the text node.

+                                       // Expand the range to include the last char <p>ab[c]</p> since IE 11 doesn't delete otherwise.

</ins><span class="cx" style="display: block; padding: 0 10px">                                         if ( rng.collapsed && startContainer && startContainer.nodeType === 3 && startContainer.data.length > 0) {

</span><span class="cx" style="display: block; padding: 0 10px">                                                rng.setStart(startContainer, startContainer.data.length - 1);

</span><span class="cx" style="display: block; padding: 0 10px">                                                rng.setEnd(startContainer, startContainer.data.length);

</span></span></pre></div>

<a id="trunkwptestsconfigsamplephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/wp-tests-config-sample.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/wp-tests-config-sample.php  2020-01-29 00:36:17 UTC (rev 47121)

+++ trunk/wp-tests-config-sample.php    2020-01-29 00:43:23 UTC (rev 47122)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,12 +15,16 @@

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> define( 'WP_DEFAULT_THEME', 'default' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Test with multisite enabled.

-// Alternatively, use the tests/phpunit/multisite.xml configuration file.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/*

+ * Test with multisite enabled.

+ * Alternatively, use the tests/phpunit/multisite.xml configuration file.

+ */

</ins><span class="cx" style="display: block; padding: 0 10px"> // define( 'WP_TESTS_MULTISITE', true );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Force known bugs to be run.

-// Tests with an associated Trac ticket that is still open are normally skipped.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/*

+ * Force known bugs to be run.

+ * Tests with an associated Trac ticket that is still open are normally skipped.

+ */

</ins><span class="cx" style="display: block; padding: 0 10px"> // define( 'WP_TESTS_FORCE_KNOWN_BUGS', true );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px"> // Test with WordPress debug mode (default).

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,13 +32,15 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> // ** MySQL settings ** //

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// This configuration file will be used by the copy of WordPress being tested.

-// wordpress/wp-config.php will be ignored.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/*

+ * This configuration file will be used by the copy of WordPress being tested.

+ * wordpress/wp-config.php will be ignored.

+ *

+ * WARNING WARNING WARNING!

+ * These tests will DROP ALL TABLES in the database with the prefix named below.

+ * DO NOT use a production database or one that is shared with something else.

+ */

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// WARNING WARNING WARNING!

-// These tests will DROP ALL TABLES in the database with the prefix named below.

-// DO NOT use a production database or one that is shared with something else.

-

</del><span class="cx" style="display: block; padding: 0 10px"> define( 'DB_NAME', 'youremptytestdbnamehere' );

</span><span class="cx" style="display: block; padding: 0 10px"> define( 'DB_USER', 'yourusernamehere' );

</span><span class="cx" style="display: block; padding: 0 10px"> define( 'DB_PASSWORD', 'yourpasswordhere' );

</span></span></pre>

</div>

</div>

</body>

</html>